Merge remote-tracking branch 'origin/master' into development

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
2017-07-29 01:55:42 -04:00
parent 17b7d6f25e 6a8868e632
commit ba1ab5d4f1
1677 changed files with 40824 additions and 21204 deletions
@@ -5,8 +5,8 @@ from datetime import timedelta
 from kombu import Exchange, Queue

 from django.apps import apps
-from django.core.urlresolvers import reverse_lazy
 from django.db.models.signals import pre_save
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _

 from acls import ModelPermission