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/files_encryption/appinfo/info.xml | |
parent | e256ac8791eedcb3dcab1ade0927f1831e24d2e2 (diff) | |
parent | a6a8e2c553bd2ba82c3d50f147a49793ed62b6f5 (diff) | |
download | nextcloud-server-e292b1fcdbe15d3a048c89f1825cb9ae8831edbb.tar.gz nextcloud-server-e292b1fcdbe15d3a048c89f1825cb9ae8831edbb.zip |
fix merge conflicts
Diffstat (limited to 'apps/files_encryption/appinfo/info.xml')
-rw-r--r-- | apps/files_encryption/appinfo/info.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml index 691b265bf60..c2e1aa96043 100644 --- a/apps/files_encryption/appinfo/info.xml +++ b/apps/files_encryption/appinfo/info.xml @@ -3,7 +3,6 @@ <id>files_encryption</id> <name>Encryption</name> <description>Server side encryption of files</description> - <version>0.1</version> <licence>AGPL</licence> <author>Robin Appelman</author> <require>3</require> |