wvengen 74bfc85562 Merge remote-tracking branch 'fsmanuel/master' into master. ... Updated migration date to today. Conflicts: db/schema.rb		2013-07-18 18:48:49 +02:00
..
de.yml	Merge remote-tracking branch 'fsmanuel/master' into master.	2013-07-18 18:48:49 +02:00
en.yml	Merge remote-tracking branch 'fsmanuel/master' into master.	2013-07-18 18:48:49 +02:00
nl.yml	update translations and localeapp roundtrip	2013-07-18 16:22:38 +02:00