Resolve merge conflicts
[mediagoblin.git] / mediagoblin / static / js / geolocation-map.js
2012-02-18 Christopher Allan... Merge branch 'master' into sqlmigrate
2012-02-02 Christopher Allan... It's 2012 all up in here
2012-01-28 Joar WandborgMerge remote-tracking branch 'joar/exif-rebase'
2012-01-28 Joar WandborgJavaScript fixes - AGPL headers, etc
2012-01-25 Joar WandborgAdded code for leaflet geolocation map