1
0
mirror of http://git.whoc.org.uk/git/password-manager.git synced 2024-11-11 00:17:16 +01:00
password-manager-mirror/frontend
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
..
beta Merge branch 'buildFix' of https://github.com/jokajak/password-manager 2012-03-17 21:28:40 +00:00
gamma Merge branch 'buildFix' of https://github.com/jokajak/password-manager 2012-03-17 21:28:40 +00:00