Skip to content
Snippets Groups Projects
Commit 059aa6ec authored by Demian Katz's avatar Demian Katz
Browse files

Merge branch 'release-2.4'

Conflicts:
	.travis.yml
parents ae501ad9 df1d6f98
Showing
No files found.
with 0 additions and 0 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