tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
050efbc126
mastodon/app
History
Thibaut Girka 050efbc126 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
2019-03-28 13:01:33 +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-28 13:01:33 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-03-28 13:01:33 +01:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2019-03-28 13:01:33 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-03-28 13:01:33 +01:00
mailers Fix error in AdminMailer#new_pending_account (#10264) 2019-03-14 14:20:22 +01:00
models Merge branch 'master' into glitch-soc/merge-upstream 2019-03-28 13:01:33 +01:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2019-03-14 17:17:20 +01:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2019-03-26 16:02:54 +01:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2019-03-28 13:01:33 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-03-28 13:01:33 +01:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2019-03-26 17:39:20 +01:00
views Merge branch 'master' into glitch-soc/merge-upstream 2019-03-28 13:01:33 +01:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2019-03-28 13:01:33 +01:00