Skip to content

Commit

Permalink
Merge branch 'deprecated-shops' of https://github.com/kocio-pl/openst…
Browse files Browse the repository at this point in the history 
…reetmap-carto

Conflicts:
	project.mml
  • Loading branch information
@matthijsmelissen
matthijsmelissen committed Oct 11, 2015
2 parents 9b57f2f + 034cb1b commit 9215479
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 30 deletions.
Loading

0 comments on commit 9215479

Please sign in to comment.