Commit 326d9e3a7fb48418cffe9ebd140a4ad06833d3f5

Authored by haribo
2 parents 3fbab223 217149a4
Exists in master and in 1 other branch dev

Merge branch 'master' of https://gitlab.irap.omp.eu/epallier/pyros.git

install/REQUIREMENTS_WINDOWS.txt
... ... @@ -23,4 +23,4 @@ six==1.10.0
23 23 sqlparse==0.1.19
24 24 Twisted==16.0.0
25 25 virtualenv==15.0.1
26 26 -zope.interface==4.1.1
  27 +zope.interface==4.1.1
27 28 \ No newline at end of file
... ...
src/fixtures/alert_mgr_test.json
... ... @@ -355,8 +355,7 @@
355 355 "error_radius": null,
356 356 "defly_not_grb": false,
357 357 "editor": null,
358   - "soln_status": null,
359   - "pkt_ser_num": null
  358 + "flag": null
360 359 }
361 360 },{
362 361 "model": "pyrosapp.request",
... ...