Upstream/ImageOnMap
1
0
Fork 0
mirror of https://github.com/zDevelopers/ImageOnMap.git synced 2024-09-20 19:01:00 +02:00
Code Issues Projects Releases Wiki Activity
a278a42b01
ImageOnMap/src/main/java/fr
History
Amaury Carrade 195f656f3c
Merge branch 'master' of github.com:zDevelopers/ImageOnMap 
Conflicts:
	src/main/java/fr/moribus/imageonmap/commands/maptool/DeleteConfirmCommand.java
	src/main/java/fr/moribus/imageonmap/gui/MapDetailGui.java
	src/main/resources/i18n/fr_FR.po
2017-03-12 20:12:35 +01:00
..
moribus/imageonmap Merge branch 'master' of github.com:zDevelopers/ImageOnMap 2017-03-12 20:12:35 +01:00