Merge remote-tracking branch 'origin/master' into feature/merge_master

This commit is contained in:
Roberto Rosario
2017-02-13 21:00:56 -04:00
53 changed files with 3665 additions and 268 deletions

View File

@@ -9,6 +9,7 @@ from common import (
MayanAppConfig, menu_facet, menu_object, menu_setup, menu_sidebar
)
from navigation import SourceColumn
from rest_api.classes import APIEndPoint
from .classes import KeyStub
from .links import (
@@ -32,6 +33,7 @@ class DjangoGPGApp(MayanAppConfig):
def ready(self):
super(DjangoGPGApp, self).ready()
APIEndPoint(app=self, version_string='1')
Key = self.get_model('Key')
ModelPermission.register(