fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-28 19:10:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app
History
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 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-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 Improve e-mail digest (#9689) 2019-01-02 10:47:32 +01:00
models Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 15:16:02 +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-03-13 15:16:02 +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-13 15:16:02 +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-13 15:16:02 +01:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 15:16:02 +01:00