Merge branch 'feature-contacts' into develop

Conflicts: webapp/admin.py webapp/models.py webapp/views.py
2018-05-16 22:48:08 +03:00
parent 9225ff5967 6e68e106aa
commit d7a3433d2c
12 changed files with 268 additions and 49 deletions
@@ -0,0 +1,6 @@
+
+.role-container {
+    background-color: aqua;
+    width: 200px;
+    text-align: center;
+}