djsundog
/
tootlab-mastodon
mirror of https://github.com/glitch-soc/mastodon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/lib
History
Thibaut Girka 53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/controllers/api/v1/mutes_controller.rb
	config/locales/simple_form.pl.yml
 		2018-08-27 18:09:28 +02:00
..
assets Add emoji autosuggest (#5053) 2017-09-23 14:47:32 +02:00
devise Add ldap search filter (#8151) 2018-08-15 18:12:44 +02:00
generators Add post-deployment migration system (#8182) 2018-08-13 18:17:20 +02:00
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2018-08-27 18:09:28 +02:00
paperclip Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream 2018-07-30 14:39:06 +02:00
tasks Merge branch 'master' into glitch-soc/merge-upstream 2018-08-27 18:09:28 +02:00
templates Add post-deployment migration system (#8182) 2018-08-13 18:17:20 +02:00
cli.rb Add CLI task for rotating keys (#8466) 2018-08-26 20:21:03 +02:00