diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-11-19 15:20:11 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-11-19 15:20:11 -0800 |
| commit | 0a1c76f9731d3ddd4738465eff46547de7825b3b (patch) | |
| tree | 69ef1c1ac84f970c2d5e47d5bb1cbf4beb118a03 | |
| parent | 9b16537e2c7c2319670af02b7e4755d1b29d80a2 (diff) | |
| parent | 23befebd72d714bee0931f7c9f01c6adcc34aeda (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/gallery/module.info
| -rw-r--r-- | modules/gallery/module.info | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/gallery/module.info b/modules/gallery/module.info index 2dc62ecd..c3a153b1 100644 --- a/modules/gallery/module.info +++ b/modules/gallery/module.info @@ -1,3 +1,4 @@ name = "Gallery 3" description = "Gallery core application" -version = 19 +version = 19 ; Note: skip version 20, use 21 as the next version + |