tracks/config/locales
Dan Rice fdd4c267b3 Merge branch 'master' into new-gui
Conflicts:
	Gemfile.lock
2014-04-02 13:26:17 -04:00
..
cs.yml update Tolk to github master for rails 4 support. It currently needs protected_attributes 2014-02-09 14:39:36 +01:00
de.yml update Tolk to github master for rails 4 support. It currently needs protected_attributes 2014-02-09 14:39:36 +01:00
en.yml Merge branch 'master' into new-gui 2014-04-02 13:26:17 -04:00
es.yml update Tolk to github master for rails 4 support. It currently needs protected_attributes 2014-02-09 14:39:36 +01:00
fr.yml update Tolk to github master for rails 4 support. It currently needs protected_attributes 2014-02-09 14:39:36 +01:00
he.yml update Tolk to github master for rails 4 support. It currently needs protected_attributes 2014-02-09 14:39:36 +01:00
nl.yml update Tolk to github master for rails 4 support. It currently needs protected_attributes 2014-02-09 14:39:36 +01:00