David Yip 82b2e224a2

Merge branch 'gs-master' into prevent-local-only-federation ...

Conflicts:
	db/schema.rb

2017-12-15 12:20:56 -06:00

..

controllers

Merge branch 'gs-master' into prevent-local-only-federation

2017-12-15 12:20:56 -06:00

helpers

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-13 18:17:16 +00:00

javascript

Update ja.js

2017-12-15 19:43:10 +09:00

lib

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-15 01:17:12 +00:00

mailers

Using double splat operator (#5859)

2017-12-06 11:41:57 +01:00

models

Merge branch 'gs-master' into prevent-local-only-federation

2017-12-15 12:20:56 -06:00

policies

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-02 14:17:11 +00:00

presenters

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

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

serializers

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-15 01:17:12 +00:00

services

Merge branch 'gs-master' into prevent-local-only-federation

2017-12-15 12:20:56 -06:00

validators

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2017-12-12 02:54:13 -06:00

views

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-13 18:17:16 +00:00

workers

Lists redis clean-up (#5886)

2017-12-05 23:20:27 +01:00