Sercan Yemen ff4899e8d2 Merge branch 'master' into skeleton ... # Conflicts: # src/app/app.module.ts # src/app/main/content/apps/calendar/calendar.component.html # src/app/main/content/apps/contacts/contact-list/contact-list.component.html # src/app/main/content/apps/contacts/contacts.component.html # src/app/main/content/apps/contacts/contacts.component.scss # src/app/main/content/apps/contacts/contacts.module.ts # src/app/main/content/apps/contacts/contacts.service.ts # src/app/main/content/apps/contacts/selected-bar/selected-bar.component.html # src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html # src/app/navigation.model.ts		2017-08-24 11:18:24 +03:00
..
content	Merge branch 'master' into skeleton	2017-08-24 11:18:24 +03:00
footer	FuseMaterialColorPicker enhanced	2017-08-22 13:45:07 +03:00
navbar	navbar position fixes	2017-08-22 16:06:01 +03:00
quick-panel	navbar fixes	2017-08-22 16:05:32 +03:00
toolbar	purchase button	2017-08-22 16:23:38 +03:00
main.component.html	FuseMaterialColorPicker enhanced	2017-08-22 13:45:07 +03:00
main.component.scss	navbar position fixes	2017-08-22 16:06:01 +03:00
main.component.ts	SearchBar Mobile fix.	2017-08-22 14:17:17 +03:00
main.module.ts	put Fuse prefix to all components	2017-08-18 14:50:19 +03:00