Andy Heathershaw fdf4d72236 Merge branch 'master' into feature/106-dropbox-storage ...

# Conflicts:
#	app/Http/Controllers/Admin/StorageController.php
#	resources/views/themes/base/admin/edit_storage.blade.php

2020-04-18 21:53:36 +01:00

..

assets

#111: User feed now displays a "user created" event logged via the register/activation controllers

2018-11-19 13:26:44 +00:00

lang/en

Merge branch 'master' into feature/106-dropbox-storage

2020-04-18 21:53:36 +01:00

systemd

#124: E-mails now send and log to the database as sent when queuing is not enabled

2019-07-14 12:29:25 +01:00

views

Merge branch 'master' into feature/106-dropbox-storage

2020-04-18 21:53:36 +01:00