Merge remote-tracking branch 'origin/master' into dev

2017-10-15 17:13:35 -04:00
parent ca8451720f c2db365922
commit e183167c9b
53 changed files with 1073 additions and 124 deletions
--- a/client/scss/app.scss
+++ b/client/scss/app.scss
@@ -42,6 +42,7 @@

@import 'layout/_header';
@import 'layout/_loader';
+@import 'layout/_rtl';

@import 'pages/login';
@import 'pages/welcome';