update branch and fix merge conflicts

1 files changed, 10 insertions, 8 deletions

diff --git a/static/font/css/fontello.css b/static/font/css/fontello.css
index 7b1fbd0c..81250ae3 100644
--- a/static/font/css/fontello.css
+++ b/static/font/css/fontello.css
@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'fontello';
-  src: url('../font/fontello.eot?90538621');
-  src: url('../font/fontello.eot?90538621#iefix') format('embedded-opentype'),
-       url('../font/fontello.woff2?90538621') format('woff2'),
-       url('../font/fontello.woff?90538621') format('woff'),
-       url('../font/fontello.ttf?90538621') format('truetype'),
-       url('../font/fontello.svg?90538621#fontello') format('svg');
+  src: url('../font/fontello.eot?79576261');
+  src: url('../font/fontello.eot?79576261#iefix') format('embedded-opentype'),
+       url('../font/fontello.woff2?79576261') format('woff2'),
+       url('../font/fontello.woff?79576261') format('woff'),
+       url('../font/fontello.ttf?79576261') format('truetype'),
+       url('../font/fontello.svg?79576261#fontello') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -15,7 +15,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'fontello';
-    src: url('../font/fontello.svg?90538621#fontello') format('svg');
+    src: url('../font/fontello.svg?79576261#fontello') format('svg');
   }
 }
 */
@@ -65,5 +65,7 @@
 .icon-cog:before { content: '\e807'; } /* '' */
 .icon-spin3:before { content: '\e832'; } /* '' */
 .icon-spin4:before { content: '\e834'; } /* '' */
+.icon-menu:before { content: '\f0c9'; } /* '' */
 .icon-reply:before { content: '\f112'; } /* '' */
-.icon-binoculars:before { content: '\f1e5'; } /* '' */
\ No newline at end of file
+.icon-binoculars:before { content: '\f1e5'; } /* '' */
+.icon-user-plus:before { content: '\f234'; } /* '' */
\ No newline at end of file