Skip to content
Snippets Groups Projects
Commit d7e17aa7 authored by sveseli's avatar sveseli
Browse files

merge from 0.8 branch

parents db44e35d 14c9c91e
No related branches found
No related tags found
No related merge requests found
...@@ -15,5 +15,5 @@ DM_DAQ_WEB_SERVICE_HOST=DM_HOSTNAME ...@@ -15,5 +15,5 @@ DM_DAQ_WEB_SERVICE_HOST=DM_HOSTNAME
DM_DAQ_WEB_SERVICE_PORT=33336 DM_DAQ_WEB_SERVICE_PORT=33336
DM_CAT_WEB_SERVICE_HOST=DM_HOSTNAME DM_CAT_WEB_SERVICE_HOST=DM_HOSTNAME
DM_CAT_WEB_SERVICE_PORT=44436 DM_CAT_WEB_SERVICE_PORT=44436
DM_SOFTWARE_VERSION="0.7 (DM_DATE)" DM_SOFTWARE_VERSION="0.8 (DM_DATE)"
__version__ = "0.7 (2015.12.08)" __version__ = "0.8 (2016.01.25)"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment