Giulio Cesare Solaroli 12cd9d47a6 Merge branch 'buildFix' of https://github.com/jokajak/password-manager ...

Conflicts:
	frontend/gamma/properties/gamma.properties.json

2012-03-17 21:28:40 +00:00

..

css

Updated /gamma web css

2012-03-17 21:10:14 +00:00

html

Updated /gamma web css

2012-03-17 21:10:14 +00:00

js

Updated /gamma web css

2012-03-17 21:10:14 +00:00

properties

Merge branch 'buildFix' of https://github.com/jokajak/password-manager

2012-03-17 21:28:40 +00:00

tests

Fixed frontend properties and updated MochiKit version

2012-03-17 21:08:23 +00:00