Skip to content
Snippets Groups Projects
Commit f88131f5 authored by Olivier PEREZ's avatar Olivier PEREZ
Browse files

Merge branch 'Filopoulos/framadate-master'

Conflicts:
	locale/it.json
parents f588a394 4f908958
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment