luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-09-15 14:38:52 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app
History
Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/status.rb
- db/schema.rb

Both conflicts are caused by us having extra database columns.
2019-03-05 19:23:16 +01:00
..
chewy
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-03-05 19:23:16 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-03-05 19:23:16 +01:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2019-03-05 19:23:16 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-03-05 19:23:16 +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-05 19:23:16 +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-02-28 21:35:53 +01:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2019-03-05 19:23:16 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-03-05 19:23:16 +01:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2019-03-05 19:23:16 +01:00
views Merge branch 'master' into glitch-soc/merge-upstream 2019-03-05 19:23:16 +01:00
workers