Skip to content
Snippets Groups Projects
Commit 8fbbb871 authored by Azul's avatar Azul
Browse files

Merge remote-tracking branch 'origin/develop' 

Conflicts:
	app/assets/javascripts/srp
	test/nagios/soledad_sync.py
	test/nagios/webapp_login.py
parents 81555ec6 a4f7a410
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 280 additions and 208 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment