fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-27 07:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app
History
Thibaut Girka 89bee860cd Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/services/post_status_service.rb
  Small conflict due to handling of instance-local toots.
  A subsequent change is required to ensure instance-local polls are not leaked
  through Update.
2019-03-11 11:23:50 +01:00
..
chewy Add type, limit, offset, min_id, max_id, account_id to search API (#10091) 2019-02-26 15:21:36 +01:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-03-11 11:23:50 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-03-05 19:23:16 +01:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2019-03-11 11:23:50 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-03-11 11:23:50 +01:00
mailers Improve e-mail digest (#9689) 2019-01-02 10:47:32 +01:00
models Merge branch 'master' into glitch-soc/merge-upstream 2019-03-11 11:23:50 +01:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2019-03-05 19:23:16 +01:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2019-02-28 21:35:53 +01:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2019-03-11 11:23:50 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-03-11 11:23:50 +01:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2019-03-06 11:29:06 +01:00
views Merge branch 'master' into glitch-soc/merge-upstream 2019-03-10 16:48:44 +01:00
workers Support pushing and receiving updates to poll tallies (#10209) 2019-03-11 00:49:31 +01:00