Eugen Rochko 47910f57da Merge branch 'master' into skylight

2017-04-09 15:01:17 +02:00

..

assets

Update fr.jsx (#1329)

2017-04-09 14:58:08 +02:00

controllers

Clean up about page (#1282)

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

helpers

Use Setting.site_title value for og:site_name occurrences (#1194)

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

lib

DRY up reblog vs original status check

2017-04-07 14:18:30 -04:00

mailers

Add digest e-mails

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

models

Search cleanup (#1333)

2017-04-09 14:45:01 +02:00

presenters

Clean up about page (#1282)

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

services

Fix #1141, fix #1126 - Avatar/profile info fetching (#1215)

2017-04-08 13:26:03 +02:00

views

French translation update (#1271)

2017-04-09 14:55:58 +02:00

workers

Merge branch 'master' into skylight

2017-04-08 13:27:04 +02:00