Skip to content
Snippets Groups Projects
Commit 170838ff authored by Joseph Mirabel's avatar Joseph Mirabel Committed by Joseph Mirabel
Browse files

Merge branch 'v1.0.2-dev' into v1.1-dev 

Conflicts:
	NEWS
	README.md
parents c39db497 ce60c747
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 142 additions and 110 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