mastodon/app
Thibaut Girka 02062aab55 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/about_controller.rb
- app/controllers/tags_controller.rb
- app/views/about/show.html.haml
- spec/views/about/show.html.haml_spec.rb
2019-03-13 15:16:02 +01:00
..
chewy
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 15:16:02 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 15:16:02 +01:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 15:16:02 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 15:16:02 +01:00
mailers
models Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 15:16:02 +01:00
policies
presenters Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 15:16:02 +01:00
serializers
services Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 15:16:02 +01:00
validators
views Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 15:16:02 +01:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 15:16:02 +01:00