fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-15 03:15:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app
History
Thibaut Girka 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/models/status.rb
	db/migrate/20180528141303_fix_accounts_unique_index.rb
	db/schema.rb

Resolved by taking upstream changes (no real conflicts, just glitch-soc
specific code too close to actual changes).
2018-08-17 17:43:54 +02:00
..
chewy Full-text search for authorized statuses (#6423) 2018-02-09 23:04:47 +01:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
mailers Account archive download (#6460) 2018-02-21 23:21:32 +01:00
models Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
policies Disallow remote users from viewing local-only toots 2018-07-31 15:41:04 +02:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2018-08-10 16:22:31 +02:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2018-07-26 21:22:43 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
workers Fix ActivityPub::UpdateDistributionWorker regression (#8039) 2018-07-16 18:43:22 +02:00