Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Rashid Khan 2013-09-30 08:46:54 -07:00
commit 044d05535b
2 changed files with 5 additions and 0 deletions

View File

@ -0,0 +1,4 @@
/** custom additions **/
.leaflet-marker-icon {
color: #333;
}

View File

@ -15,6 +15,7 @@ define([
'./leaflet/leaflet-src',
'require',
'css!./module.css',
'css!./leaflet/leaflet.css',
'css!./leaflet/plugins.css'
],