luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-01 19:14:23 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/lib
History
Thibaut Girka cd99255698 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/controllers/oauth/authorizations_controller.rb

Just two changes being too close to one another.
Took both.
2018-09-11 16:51:26 +02:00
..
assets
devise Fix wrong string being used on login failure when using LDAP (#8534) 2018-09-01 03:35:37 +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-09-11 16:51:26 +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-09-11 16:51:26 +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