4 Commits

Author	SHA1	Message	Date
David Yip	b28b405b97	Merge remote-tracking branch 'origin/master' into gs-master	2017-11-16 22:52:37 -06:00
Eugen Rochko	2151fd3150	Display moderator badge (green), admin badge changed to red (#5728)	2017-11-17 01:22:38 +01:00
David Yip	42e8c8eb0e	Merge tag 'v2.0.0' into gs-master	2017-10-18 11:52:04 -05:00
YaQ	6e54719474	Make theme directory and Rename application.scss (#5336) ... * Rename application.scss * Move to 'default' directory * Follow review Move directory, and Rename "mastodon". * Revert rename * undo removal of newline	2017-10-18 05:20:07 +09:00