Andrew d439ab6640 Merge branches 'dependency_whatinput', 'feature_512_char_toots', 'feature_cybrespace_locale', 'feature_doodlebox', 'feature_hotlink_twitter_mentions', 'feature_longer_bios', 'feature_machine_registration_task', 'branding_cybre' and 'theme_base' into cybrespace		2018-09-14 14:43:25 -07:00
..
assets
devise	Fix wrong string being used on login failure when using LDAP (#8534)	2018-09-01 03:35:37 +02:00
generators
mastodon	Cybrespace branding	2018-09-11 20:17:06 -07:00
paperclip
tasks	Feature: add a rake task that's like register but also accepts password	2018-09-11 20:46:00 -07:00
templates
cli.rb	Add CLI task for rotating keys (#8466)	2018-08-26 20:21:03 +02:00