Skip to content
Snippets Groups Projects
Commit 515c877e authored by LE GAC Renaud's avatar LE GAC Renaud
Browse files

Due a wrong manipulation at 0f2b5929 rephase the branch with its origin. 

Conflicts:
	controllers/reports.py
	static/plugin_dbui/src/panelwithurlselector.js
parents 0f2b5929 cba416c3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 772 additions and 653 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment