merge master

apps/common/templatetags/common_tags.py

@@ -32,8 +32,4 @@ def pagination_range(total_page, current_num=1, display=5):
     start = current_num - display/2 if current_num > display/2 else 1
     end = start + display if start + display <= total_page else total_page + 1
 
-    return range(start, end)
-
-
-
-
+    return range(start, end)

apps/common/utils.py

@@ -21,4 +21,3 @@ def get_object_or_none(model, **kwargs):
     except model.DoesNotExist:
         obj = None
     return obj
-