Eugen Rochko 9f7ea77d0c Merge branch 'master' of github.com:tootsuite/mastodon

2017-04-11 21:30:48 +02:00

..

assets

Merge branch 'master' of github.com:tootsuite/mastodon

2017-04-11 21:30:48 +02:00

controllers

Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master

2017-04-11 20:43:56 +02:00

helpers

Remove unused methods from StreamEntriesHelper (#1365)

2017-04-11 19:32:02 +02:00

lib

Remove order prior to .find_in_batches (#1470)

2017-04-11 00:38:34 +02:00

mailers

Add digest e-mails

2017-03-04 00:00:48 +01:00

models

Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master

2017-04-11 20:43:56 +02:00

presenters

Clean up about page (#1282)

2017-04-09 14:47:25 +02:00

services

Remove unused AtomBuilderHelper (#1364)

2017-04-11 19:31:22 +02:00

views

Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master

2017-04-11 20:43:56 +02:00

workers

Fix for Import issue from URL (#1416)

2017-04-10 12:49:34 +02:00