jinql
/
blur-admin
mirror of https://github.com/akveo/blur-admin
1
0
Fork 0
Code Issues Releases Wiki Activity
blur-admin/src/app
History
Vladimir Lugovsky 80284edc67 Merge branch 'v2' into build-refactor 
Conflicts:
	src/app/components/contentTop/contentTop.js
	src/app/components/sidebar/sidebar.js
	src/assets/css/main.scss
 		2015-12-16 02:12:38 +03:00
..
pages Merge branch 'v2' into build-refactor 2015-12-16 02:12:38 +03:00
theme Merge branch 'v2' into build-refactor 2015-12-16 02:12:38 +03:00
tplSkin feat(build): style refactoring snapshot 2015-12-15 18:51:53 +03:00
app.js Merge branch 'v2' into build-refactor 2015-12-16 02:12:38 +03:00