luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-01 20:45:56 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app
History
Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb

Moved public.js changes to settings.js.
2018-12-09 16:08:04 +01:00
..
chewy
controllers Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
mailers Fix low-hanging rubocop gripes (#8458) 2018-08-26 19:22:46 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2018-11-29 19:22:52 +01:00
serializers Add backend support to read and update list-specific show_replies settings 2018-11-28 14:46:07 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2018-11-09 14:56:31 +01:00
views Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
workers Improve account suspension speed and completeness (#9290) 2018-12-03 01:32:08 +01:00