Jenkins 8ca91cef45 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-06 20:17:13 +00:00

..

assets

Add emoji autosuggest (#5053)

2017-09-23 14:47:32 +02:00

json_ld

Use updated ActivityStreams context (added: sharedInbox) (#4764)

2017-09-02 14:00:58 +02:00

mastodon

Bump version to 2.1.0rc1 (#5834)

2017-12-06 16:13:32 +01:00

paperclip

Merge remote-tracking branch 'origin/master' into gs-master

2017-10-26 09:18:27 -05:00

tasks

Add moderator role and add pundit policies for admin actions (#5635)

2017-11-11 20:23:33 +01:00

templates/haml/scaffold

Adding simple_form, adding profile settings, header image

2016-03-12 20:47:22 +01:00