Merge remote-tracking branch 'upstream/pull/1974'
authorTom Hughes <tom@compton.nu>
Wed, 5 Sep 2018 18:06:16 +0000 (19:06 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 5 Sep 2018 18:06:16 +0000 (19:06 +0100)
commit983e21db2e3ccc5f645f40a5f076d35e2b7897c2
treedcf99ddfb45991dc0ad82324f95b98bc1a7ea61b
parent70cca71f3802519eac1fabaeb3ee1cc9f35f5cb7
parentde6aa3f01512986cf9690def3e9004f755da750a
Merge remote-tracking branch 'upstream/pull/1974'
app/views/changeset/history.html.erb
app/views/changeset/index.atom.builder
app/views/user/show.html.erb
config/locales/en.yml
config/routes.rb