David Yip 82b2e224a2 Merge branch 'gs-master' into prevent-local-only-federation ...

Conflicts:
	db/schema.rb

2017-12-15 12:20:56 -06: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.0rc6

2017-12-15 02:00:28 +01:00

paperclip

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

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

tasks

Add Rake task to backfill local-only flag (#253)

2017-12-10 22:49:59 -06:00

templates/haml/scaffold

…