Merge branch '0.1.2.2-ALPHA' of https://github.com/osmottawa/OSVUploa… · osmottawa/OSVUploadr@d00013c · GitHub

Commit

Merge branch '0.1.2.2-ALPHA' of https://github.com/osmottawa/OSVUploadr…

Browse files

… into 0.1.2.2-ALPHA

Conflicts:
	OSVUploadr/src/main/java/ca/osmcanada/osvuploadr/JPMain.java

Loading branch information

james2432 committed Sep 27, 2016

2 parents 22b817f + a729213 commit d00013c