diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-15 12:43:07 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-15 12:43:07 +0200 |
| commit | e292b1fcdbe15d3a048c89f1825cb9ae8831edbb (patch) | |
| tree | a310b840389eff1f324b68c3ed3a002b0bb963e7 /apps/external | |
| parent | e256ac8791eedcb3dcab1ade0927f1831e24d2e2 (diff) | |
| parent | a6a8e2c553bd2ba82c3d50f147a49793ed62b6f5 (diff) | |
| download | nextcloud-server-e292b1fcdbe15d3a048c89f1825cb9ae8831edbb.tar.gz nextcloud-server-e292b1fcdbe15d3a048c89f1825cb9ae8831edbb.zip | |
fix merge conflicts
Diffstat (limited to 'apps/external')
| -rw-r--r-- | apps/external/appinfo/info.xml | 1 | ||||
| -rw-r--r-- | apps/external/appinfo/version | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/apps/external/appinfo/info.xml b/apps/external/appinfo/info.xml index 05f5709916d..83130f17e62 100644 --- a/apps/external/appinfo/info.xml +++ b/apps/external/appinfo/info.xml @@ -3,7 +3,6 @@ <id>external</id> <name>External</name> <description>Show external Application in the ownCloud menu</description> - <version>1.0</version> <licence>AGPL</licence> <author>Frank Karlitschek</author> <require>2</require> diff --git a/apps/external/appinfo/version b/apps/external/appinfo/version new file mode 100644 index 00000000000..9f8e9b69a33 --- /dev/null +++ b/apps/external/appinfo/version @@ -0,0 +1 @@ +1.0
\ No newline at end of file |