Eugen Rochko 1ebcdf84b5 Merge branch 'master' into skylight

2017-04-13 22:28:33 +02:00

..

assets

Fix drag & drop overlay not appearing on firefox (#1721)

2017-04-13 22:21:34 +02:00

controllers

Clean up well-known routes/controllers (#1649)

2017-04-13 13:09:07 +02:00

helpers

Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master

2017-04-13 22:25:07 +02:00

lib

Fix #1220, fix #1671 - Hook up comment box to the Redux comment value (#1699)

2017-04-13 19:36:41 +02:00

mailers

Make Reporting admin section translatable (#1549)

2017-04-12 17:11:49 +02:00

models

Admin accounts controller cleanup (#1664)

2017-04-13 13:04:23 +02:00

presenters

Clean up about page (#1282)

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

services

Silence more scope order warnings (#1604)

2017-04-12 15:58:08 +02:00

validators

Organize coverage dirs (#1695)

2017-04-13 16:00:31 +02:00

views

Translate admin (#1702)

2017-04-13 21:49:07 +02:00

workers

Merge branch 'master' into skylight

2017-04-12 21:12:07 +02:00