Skip to content
Snippets Groups Projects
Commit 0505ab6b authored by Antonin's avatar Antonin
Browse files

Merge remote-tracking branch 'upstream/develop' into develop 

Conflicts:
	app/classes/Framadate/Utils.php
parents fbd45960 3ef40417
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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