diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-02-18 10:01:47 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-02-18 10:01:47 -0600 |
| commit | 63352aaf70d97a37b6277fab0f9b957d34dcb9df (patch) | |
| tree | acdedffc204d89f1f71f09696270e5719f5e3123 /mediagoblin/static/js/geolocation-map.js | |
| parent | 7f3ec607a34e727324397c2bf240f771b12a0455 (diff) | |
| parent | feba5c5287a7cb4c0ed8f5124ad60a8a291770ad (diff) | |
| download | mediagoblin-63352aaf70d97a37b6277fab0f9b957d34dcb9df.tar.lz mediagoblin-63352aaf70d97a37b6277fab0f9b957d34dcb9df.tar.xz mediagoblin-63352aaf70d97a37b6277fab0f9b957d34dcb9df.zip | |
Merge branch 'master' into sqlmigrate
Conflicts:
mediagoblin/db/sql/models.py
Diffstat (limited to 'mediagoblin/static/js/geolocation-map.js')
| -rw-r--r-- | mediagoblin/static/js/geolocation-map.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/static/js/geolocation-map.js b/mediagoblin/static/js/geolocation-map.js index 35083d4f..a2c62045 100644 --- a/mediagoblin/static/js/geolocation-map.js +++ b/mediagoblin/static/js/geolocation-map.js @@ -1,6 +1,6 @@ /** * GNU MediaGoblin -- federated, autonomous media hosting - * Copyright (C) 2011 MediaGoblin contributors. See AUTHORS. + * Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by |