Skip to content

Commit

Permalink
Merge branch 'release-2_14' of github.com:qgis/QGIS into release-2_14
Browse files Browse the repository at this point in the history 
Conflicts:
	python/plugins/processing/core/GeoAlgorithm.py
  • Loading branch information
@borysiasty
borysiasty committed Jan 23, 2017
2 parents 836f215 + 730c164 commit dd54688
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit dd54688

Please sign in to comment.