fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-23 22:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app
History
Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +02:00
..
chewy Add more accurate hashtag search (#11579) 2019-08-18 03:45:51 +02:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
mailers Add password challenge to 2FA settings, e-mail notifications (#11878) 2019-09-18 16:37:27 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2019-08-06 13:16:53 +02:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2019-08-30 13:38:41 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00