Merge

salopensource · Feb 19, 2018 · 1d1879a · 1d1879a
1 parent 82e2cfc
commit 1d1879a
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.0.1204</string>
+	<string>3.3.0.1224</string>
 </dict>
 </plist>
diff --git a/server/migrations/0065_merge_20180219_0057.py b/server/migrations/0065_merge_20180219_0057.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2018-02-19 08:57
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('server', '0064_clean_friendly_names'),
+        ('server', '0064_auto_20180216_1349'),
+    ]
+
+    operations = [
+    ]