diff options
author | Tim Almdal <tnalmdal@shaw.ca> | 2010-03-31 07:14:06 -0700 |
---|---|---|
committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-03-31 07:14:06 -0700 |
commit | f2ed1eeab2074fc004c604d02bbf2ebe7c1177db (patch) | |
tree | fe0f4037e44cd33d5716d1a44930ed19ca3a34fc /modules/rest/module.info | |
parent | e56473c5d78842210b7825300bd9b373c104cb83 (diff) | |
parent | ca977dce516b9e2ca9539db69fce188ed33d971c (diff) |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/rest/controllers/rest.php
Diffstat (limited to 'modules/rest/module.info')
-rw-r--r-- | modules/rest/module.info | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/rest/module.info b/modules/rest/module.info index 45bd79e4..3ab7e165 100644 --- a/modules/rest/module.info +++ b/modules/rest/module.info @@ -1,4 +1,4 @@ name = "REST Access Module" description = "The RESTful implementation/interface to Gallery3" -version = 1 +version = 2 |