Merge branch 'feature/gm-148' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/gm-148

2019-10-21 16:48:39 +03:00 · 2019-10-21 16:48:39 +03:00 · 19caf9faa6
commit 19caf9faa6
parent f96a1d4aa2 cc5249674d
2 changed files with 21 additions and 6 deletions
--- a/apps/tag/migrations/0004_merge_20191021_1138.py
+++ b/apps/tag/migrations/0004_merge_20191021_1138.py
@ -0,0 +1,14 @@
+# Generated by Django 2.2.4 on 2019-10-21 11:38
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tag', '0003_auto_20191018_0758'),
+        ('tag', '0003_tag_priority'),
+    ]
+
+    operations = [
+    ]
--- a/project/templates/news/news_email.html
+++ b/project/templates/news/news_email.html