Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2025-12-24 03:10:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'beta' of bitbucket.org:smartapant/angular2-admin into beta

Browse source 
Conflicts:
	src/app/theme/components/index.ts
This commit is contained in:
nixa 2016-07-01 15:10:08 +03:00
commit e7d21b2239
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/pages/editors/components/ckeditor/ckeditor.loader.ts
View file

@ -1,2 +1,2 @@
window.CKEDITOR_BASEPATH = '//cdn.ckeditor.com/4.5.9/standard/';
window['CKEDITOR_BASEPATH'] = '//cdn.ckeditor.com/4.5.9/standard/';
require('ckeditor');