luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-18 21:03:27 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app
History
Thibaut Girka 9044a2b051 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/views/directories/index.html.haml
  Upstream has redesigned the profile directory, and we
  had a glitch-soc-specific change to hide follower counts.
  Ported that change to the new design.
2019-08-30 13:38:41 +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-08-30 13:38:41 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-08-30 13:38:41 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2019-08-30 13:38:41 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-08-30 13:38:41 +02:00
mailers Add option to include reported statuses in warning e-mail (#11639) 2019-08-23 22:37:23 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2019-08-30 13:38:41 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2019-08-06 13:16:53 +02:00
presenters
serializers Merge branch 'master' into glitch-soc/merge-upstream 2019-08-30 13:38:41 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-08-30 13:38:41 +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-08-30 13:38:41 +02:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2019-08-29 12:07:50 +02:00