alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/lib
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
..
assets Add emoji autosuggest () 2017-09-23 14:47:32 +02:00
devise Fix authentication before 2FA challenge () 2019-09-24 04:35:36 +02:00
generators Add post-deployment migration system () 2018-08-13 18:17:20 +02:00
json_ld Bump json-ld-preloaded from 3.0.2 to 3.0.3 () 2019-07-28 13:48:43 +02:00
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
paperclip Fix converted media being saved with original extension and mime type () 2019-06-20 10:52:36 +02:00
tasks Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
templates Add post-deployment migration system () 2018-08-13 18:17:20 +02:00
cli.rb Add `tootctl preview_cards remove` () 2019-07-28 13:48:19 +02:00