Skip to content
Snippets Groups Projects
Commit 190ee35e authored by Jean-François Ferry's avatar Jean-François Ferry
Browse files

Merge branch 'develop' into api_rest 

Conflicts:
	htdocs/user/card.php
	htdocs/user/class/user.class.php
parents a6182747 bcd254c1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 548 additions and 413 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