Maikel Linke 82182d24e7 Merge remote-tracking branch 'origin/master' into discourse-sso

2016-02-19 11:02:59 +11:00

..

en-GB.yml

Fxing conflicts

2016-02-11 16:14:44 +00:00

en.yml

Merge remote-tracking branch 'origin/master' into discourse-sso

2016-02-19 11:02:59 +11:00

es.yml

Updating translations for es.yml, fr.yml and nb.yml

2015-12-24 11:44:12 +11:00

fr.yml

Change "&" to "and"

2016-02-09 10:01:51 +00:00

nb.yml

Change "&" to "and"

2016-02-09 10:01:51 +00:00

simple_form.en.yml

Add default simple_form configuration, locales, scaffold

2012-06-19 10:29:26 +10:00