diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-09-30 07:48:19 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-09-30 07:48:19 -0700 |
| commit | 612bc3f0913f7f410f417ee02934491b9d2e410d (patch) | |
| tree | d2ad1a4009d545f3565c93f8c55a8fbf3092ed84 /modules/gallery/module.info | |
| parent | a2108787257739a83708ea5c3bc21bd11e6dad17 (diff) | |
| parent | 19cb27c9a4489c357c0e516c69ebcb218f8832c1 (diff) | |
Merge branch 'talmdal_dev' of git@github.com:gallery/gallery3 into talmdal_dev
Conflicts:
modules/gallery/helpers/block_manager.php
modules/gallery/libraries/Theme_View.php
modules/image_block/helpers/image_block_block.php
modules/image_block/helpers/image_block_theme.php
modules/info/helpers/info_block.php
modules/info/helpers/info_installer.php
Diffstat (limited to 'modules/gallery/module.info')
0 files changed, 0 insertions, 0 deletions