Merge remote-tracking branch 'upstream/pull/1964'
authorTom Hughes <tom@compton.nu>
Thu, 30 Aug 2018 17:26:05 +0000 (18:26 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 30 Aug 2018 17:26:05 +0000 (18:26 +0100)
commita1b179fa384d689e6cb78c2b8d863621e7bff152
treeca5aca6846bb3f5f288c2a178bb7022e18695155
parent720da8b78ce22cb4049aecd2caafba38b7e778a9
parent8a4405dd0c3af7783d0cc9a4f864f4ee5cd0e71d
Merge remote-tracking branch 'upstream/pull/1964'
config/locales/en.yml
config/routes.rb