Merge migrations

salopensource · Jun 21, 2018 · 367b11c · 367b11c
1 parent cadb1ad
commit 367b11c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/sal/version.plist b/sal/version.plist
@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>version</key>
-	<string>3.3.5.1463</string>
+	<string>3.3.6.1477</string>
 </dict>
 </plist>
diff --git a/server/migrations/0074_merge_20180621_1250.py b/server/migrations/0074_merge_20180621_1250.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2018-06-21 19:50
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('server', '0069_manual_dump_friendly_names'),
+        ('server', '0073_remove_machine_report_format'),
+    ]
+
+    operations = [
+    ]