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

..

creditsAndCopyrights.txt

First version of the newly restructured repository

2011-10-03 00:56:18 +01:00

gamma.properties.json

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

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

mobile.properties.json

First version of the newly restructured repository

2011-10-03 00:56:18 +01:00