El RIDO 588e01fbec Merge branch 'master' of git@github.com:elrido/ZeroBin.git ... Conflicts: i18n/fr.json		2015-09-06 19:23:43 +02:00
..
de.json	implementing a plural translation solution, currently only the JS part	2015-09-06 15:54:43 +02:00
fr.json	Merge branch 'master' of git@github.com:elrido/ZeroBin.git	2015-09-06 19:23:43 +02:00
pl.json	implementing a plural translation solution, currently only the JS part	2015-09-06 15:54:43 +02:00