/pushapi: Auto stash before merge of "theslby/pushapi" and "development"

Push Frontend
2018-03-06 15:41:13 +00:00 · 2018-03-06 15:41:13 +00:00 · ff0fe0202f
commit ff0fe0202f
parent 59cbc920c2
16 changed files with 528 additions and 44 deletions
--- a/src/app/layouts/full-layout.component.html
+++ b/src/app/layouts/full-layout.component.html
@ -19,9 +19,8 @@
      </div>
    </li>
  </ul>
-  <push></push>
+  <app-push>HELLO</app-push>
 </header>
-
 <div class="app-body">
  <div class="sidebar">
    <nav class="sidebar-nav">
@ -117,7 +116,6 @@
  </main>

 </div>
-
 <footer class="app-footer">
  <a href="http://www.peartrade.org" target="_blank">&copy; 2017 Pear Trading Ltd.</a>
  <span class="float-right">Powered by <a href="http://coreui.io">CoreUI</a></span>