David Yip 991371af5f Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: db/schema.rb		2018-01-09 14:16:45 -06:00
..
about	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
accounts	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-08 10:17:15 +00:00
admin	Merge remote-tracking branch 'origin/master' into merge-upstream	2017-12-30 17:20:07 -06:00
admin_mailer
application
auth	Add consumable invites (#5814)	2017-11-27 16:07:59 +01:00
authorize_follows
errors	New error page graphic. Other error page improvements (#5099)	2017-09-25 23:05:54 +02:00
follower_accounts
following_accounts
home	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
invites	Fix invites form path (#5861)	2017-12-01 12:26:57 +01:00
kaminari
layouts	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-03 04:17:11 +00:00
notification_mailer
oauth
remote_follow
settings	Don't show skins selector when there's only one (#256)	2018-01-08 16:45:32 -08:00
shared	fix presented og:url is incorrect (#5320)	2017-10-11 19:22:21 +02:00
shares	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
stream_entries	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-09 14:16:45 -06:00
tags	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	2017-12-12 02:54:13 -06:00
user_mailer	Update Simplified Chinese translations (#6215)	2018-01-07 17:32:50 +09:00
well_known	Remove rabl dependency (#5894)	2017-12-06 15:04:49 +09:00