Manuel Wiedenmann 5b7ec86ed6 Merge branch master into i18n		2013-06-14 02:02:57 +02:00
..
en.defaults.yml	adds a new user settings system + migration + rake task/worker updates	2013-06-06 03:40:15 +02:00
en.simple_form.yml	adds a new user settings system + migration + rake task/worker updates	2013-06-06 03:40:15 +02:00