Philipp Fischbeck 2fb1a2d6a1 Merge remote-tracking branch 'origin/master' into translation-tips ... # Conflicts: # app/controllers/translations_controller.rb		2019-02-02 19:23:55 +01:00
..
assets	Add ability to accept or decline translations	2019-02-02 17:53:02 +01:00
controllers	Add ability to accept or decline translations	2019-02-02 17:53:02 +01:00
helpers	Add MathJax to seeds.rb, update locales	2017-11-28 11:43:11 +01:00
jobs	Update rails and code	2017-11-23 13:52:13 +01:00
mailers	Project setup	2014-11-30 16:38:53 +01:00
models	Add ability to accept or decline translations	2019-02-02 17:53:02 +01:00
views	Merge remote-tracking branch 'origin/master' into translation-tips	2019-02-02 19:23:55 +01:00