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
..
app	Merge branch 'master' into skeleton	2017-08-24 11:18:24 +03:00
assets	Reformatting.	2017-08-17 10:40:25 +03:00
environments	Reformatting.	2017-08-17 10:40:25 +03:00
favicon.ico	page layouts fixed	2017-08-21 15:02:03 +03:00
index.html	perfect scrollbar update on nav item toggle	2017-08-22 15:42:11 +03:00
main.ts	Reformatting.	2017-08-17 10:40:25 +03:00
polyfills.ts	Reformatting.	2017-08-17 10:40:25 +03:00
styles.scss	layout firefox + safari stuff	2017-08-14 17:09:00 +03:00
test.ts	Reformatting.	2017-08-17 10:40:25 +03:00
tsconfig.app.json	Reformatting.	2017-08-17 10:40:25 +03:00
tsconfig.spec.json	Reformatting.	2017-08-17 10:40:25 +03:00
typings.d.ts	Reformatting.	2017-08-17 10:40:25 +03:00