c-cms/c-cms-legacy
1
0
Fork 0
mirror of https://gitlab.com/TheGamecraft/c-cms.git synced 2026-04-21 02:39:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge gitlab.com:TheGamecraft/c-cms

Browse Source 
Conflicts:
	.gitignore
	app/Http/Controllers/AdminController.php
	app/Providers/AppServiceProvider.php
	app/User.php
	artisan
	bootstrap/cache/.gitignore
	composer.lock
	config/app.php
	database/migrations/2014_10_12_000000_create_users_table.php
	readme.md
	resources/views/admin/dashboard.blade.php
	resources/views/auth/login.blade.php
	resources/views/layouts/admin/header.blade.php
	routes/web.php
	storage/app/.gitignore
	storage/app/public/.gitignore
	storage/framework/.gitignore
	storage/framework/cache/.gitignore
	storage/framework/sessions/.gitignore
	storage/framework/testing/.gitignore
	storage/framework/views/.gitignore
	storage/logs/.gitignore
This commit is contained in:
TheGamecraft
2018-07-13 13:36:39 -04:00
parent 51b5bc0500 ba4114a66c
commit 5d3a9fa902
7805 changed files with 861844 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/admin/dashboard.blade.php
View File

@@ -70,4 +70,4 @@
} );
} )( jQuery );
</script>
@endsection
@endsection