luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-27 09:03:12 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app
History
Thibaut Girka 9101254d0a Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream modified code that we split between multiple files due
  to glitch-soc's theming system.
  Ported those changes.
2020-04-05 18:32:06 +02:00
..
chewy Fix bookmarks also searchable (#13293) 2020-03-22 02:40:03 +01:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2020-04-05 18:32:06 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2020-04-04 21:47:37 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2020-04-05 18:32:06 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-04-05 18:32:06 +02:00
mailers
models Merge branch 'master' into glitch-soc/merge-upstream 2020-04-05 18:32:06 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
presenters
serializers Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2020-04-02 20:32:00 +02:00
validators Improve polls: option lengths & redesign (#13257) 2020-04-02 17:10:55 +02:00
views Fix admin audit log crash due to glitch-soc theming changes 2020-04-04 23:15:08 +02:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2020-04-05 18:32:06 +02:00