David Yip 38f6d8130d Eliminate stray conflict markers.

2018-01-20 10:46:43 -06:00

..

controllers

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

2018-01-19 15:22:10 -06:00

helpers

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

2018-01-20 10:45:43 -06:00

javascript

Eliminate stray conflict markers.

2018-01-20 10:46:43 -06:00

lib

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

2018-01-19 15:22:10 -06:00

mailers

Replace tutorial modal with welcome e-mail (#6273)

2018-01-18 19:17:25 +01:00

models

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

2018-01-19 15:22:10 -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

2018-01-17 16:17:10 +00:00

services

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

2018-01-18 09:17:58 -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 'origin/master' into merge-upstream

2018-01-20 10:45:43 -06:00

workers

Retry delivering toots over ActivityPub for about 2 days (#6298)

2018-01-19 15:49:48 +01:00