Merge branch 'features/mercs_5_6' into 3_way_merge

Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>

mayan/apps/common/migrations/0012_auto_20181229_0738.py

@@ -1,14 +1,13 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.16 on 2018-12-29 07:38
 from __future__ import unicode_literals
 
 from django.db import migrations, models
+
 import mayan.apps.common.classes
 import mayan.apps.common.models
+import mayan.apps.storage.classes
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('common', '0010_auto_20180403_0702_squashed_0011_auto_20180429_0758'),
     ]
@@ -17,6 +16,10 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='shareduploadedfile',
             name='file',
-            field=models.FileField(storage=mayan.apps.common.classes.FakeStorageSubclass(), upload_to=mayan.apps.common.models.upload_to, verbose_name='File'),
+            field=models.FileField(
+                storage=mayan.apps.storage.classes.FakeStorageSubclass(),
+                upload_to=mayan.apps.common.models.upload_to,
+                verbose_name='File'
+            ),
         ),
     ]