Skip to content
Permalink
Browse files
Merge branch 'release-2_14' of github.com:qgis/QGIS into release-2_14
Conflicts:
	python/plugins/processing/core/GeoAlgorithm.py
  • Loading branch information
borysiasty committed Jan 23, 2017
2 parents 836f215 + 730c164 commit dd54688d762a859e4a677acfea477eaf875e9fea
Showing with 0 additions and 0 deletions.

0 comments on commit dd54688

Please sign in to comment.