Merge from trunk.

This commit is contained in:
2014-08-28 15:26:00 +00:00
parent 91b1f6f28c
commit deea103fdf
Notes: subgit 2018-03-07 17:59:04 +01:00
r711 www/branches/life
5 changed files with 52 additions and 34 deletions

1
.gitattributes vendored
View File

@@ -1,4 +1,5 @@
* text=auto !eol
www/copyright.inc.de -text
www/external/TileLayer.Grayscale.js -text
www/external/css/dvf.css -text
www/external/css/leaflet.label.css -text