]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into master
authorAndré Lewin <andre.charles.lewin@gmail.com>
Wed, 5 Apr 2017 18:28:58 +0000 (20:28 +0200)
committerGitHub <noreply@github.com>
Wed, 5 Apr 2017 18:28:58 +0000 (20:28 +0200)
commitbf7cefa516075b480fd5da5ea4b1385d7d17bdd5
tree45bc6b379f5d06553d0a3e5bf4c0e2b452b7552f
parent8736ef50ad13d5506bd6a673d4fcb96c33b609a3
parentd13d169922c7efeb6e6c20ef6a271eeda552275f
Merge branch 'master' into master
app/assets/javascripts/components/containers/mastodon.jsx
app/assets/javascripts/components/locales/index.jsx
app/helpers/settings_helper.rb
config/application.rb