summaryrefslogtreecommitdiff
path: root/modules/exif
diff options
context:
space:
mode:
authorNathan Kinkade <nath@nkinka.de>2011-05-12 23:48:54 +0000
committerNathan Kinkade <nath@nkinka.de>2011-05-12 23:48:54 +0000
commit2ad445441974c64599df496ba4a585415aa41169 (patch)
tree49b2860fdac2d2ff16134bfa2aa8d8a972b93301 /modules/exif
parent1f7c1f18c651c58048e92d615c71ac0fe6691c10 (diff)
parent9aeb824aa1d15bd94bd7cef0a322c4e8a667e67b (diff)
Manually merged a conflict after pulling from upstream.
Diffstat (limited to 'modules/exif')
-rw-r--r--modules/exif/module.info4
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/exif/module.info b/modules/exif/module.info
index c8ae688e..e266e20e 100644
--- a/modules/exif/module.info
+++ b/modules/exif/module.info
@@ -1,3 +1,7 @@
name = "Exif Data"
description = "Extract Exif data and display it on photo pages."
version = 1
+author_name = "Gallery Team"
+author_url = "http://codex.gallery2.org/Gallery:Team"
+info_url = "http://codex.gallery2.org/Gallery3:Modules:exif"
+discuss_url = "http://gallery.menalto.com/forum_module_exif"