sercan 45aa7cc026 Merge branch 'master' into skeleton ...

# Conflicts:
#	src/app/main/apps/contacts/contacts.component.ts
#	src/app/main/apps/e-commerce/orders/orders.component.ts
#	src/app/main/apps/e-commerce/products/products.component.ts
#	src/app/main/documentation/changelog/changelog.component.html
#	src/app/main/documentation/components/navigation/navigation.component.ts
#	src/app/main/pages/authentication/register/register.component.ts
#	src/app/main/pages/authentication/reset-password-2/reset-password-2.component.ts
#	src/app/navigation/navigation.ts

2020-07-23 15:25:26 +03:00

..

components

Merge branch 'master' into skeleton

2020-07-23 15:25:26 +03:00

horizontal/layout-1

Merge changes from 'master' into 'skeleton'

2019-05-30 14:32:51 +03:00

vertical

Merge 'master' into skeleton

2019-01-17 07:31:40 +03:00

layout.module.ts

Changed layout names to make them easier to understand

2018-06-12 10:44:00 +03:00