Merged changes in master.

This commit is contained in:
Ydmir
2016-01-24 00:27:03 +01:00
23 changed files with 889 additions and 382 deletions

View File

@@ -58,6 +58,8 @@ INSTALLED_APPS = (
'hrapplications',
'timerboard',
'srp',
'sigtracker',
'optimer',
'corputils',
)