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
..
errors	Applied missing Git file	2016-09-01 16:37:49 +01:00
install	#25: Updated the installer to work with a brand-new system with just PHP installed. Changed the way the base URL is determined to work with systems that have to access the app using /public.	2017-09-06 10:33:22 +01:00
themes	Merge branch 'master' into feature/106-dropbox-storage	2020-04-18 21:53:36 +01:00
vendor/mail	Upgraded Laravel from 5.5 to 6.0 LTS, as well as latest Composer dependencies #142	2020-04-18 17:45:40 +01:00