]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sat, 19 Jan 2019 17:28:37 +0000 (18:28 +0100)
committerThibaut Girka <thib@sitedethib.com>
Sat, 19 Jan 2019 17:28:37 +0000 (18:28 +0100)
commit5e0cf92fd145b27053389e5ffcce48da77439713
tree27e1567b240f1a3117de595413ccceb9222d8465
parent530d29148ca0c5bf29f6fa516b1ef4f91d95894b
parent7c3fddeab4c4ddebca7d5441ac67870aa1cecfe4
Merge branch 'master' into glitch-soc/merge-upstream

No conflicts.
16 files changed:
Dockerfile
Gemfile
Gemfile.lock
app/controllers/tags_controller.rb
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/packs/public.js
app/models/status.rb
app/models/user.rb
app/views/directories/index.html.haml
app/views/tags/show.html.haml
config/locales/de.yml
config/locales/en.yml
db/schema.rb
lib/mastodon/version.rb
package.json
yarn.lock