matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
Conflicts:
	apps/main/__init__.py
This commit is contained in:
Roberto Rosario
2011-12-05 22:47:58 -04:00
parent 5ec7898c55 fff202e5b4
commit 7d604322ac
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/main/__init__.py
+1 -1
View File
@@ -21,7 +21,7 @@ __version_info__ = {
'minor': 10,
'micro': 0,
'releaselevel': 'hotfix',
'serial': 2
'serial': 4
}
def is_superuser(context):