[Pkg-owncloud-commits] [owncloud] 04/07: Imported Upstream version 7.0.11~~rc2~dfsg

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit e5c1e0c05d43350435041a636162e7e0061ada0b
Merge: 80574dc 912e346
Author: David Prévot <taffit at debian.org>
Date:   Wed Oct 28 12:48:38 2015 -0400

    Imported Upstream version 7.0.11~~rc2~dfsg

 index.php   | 8 ++++++++
 version.php | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --cc version.php
index 442429c,d24da20..2b38f2a
--- a/version.php
+++ b/version.php
@@@ -1,6 -1,19 +1,6 @@@
 -<?php
 -
 -// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 -// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 -// when updating major/minor version number.
 -$OC_Version=array(7, 0, 11, 1);
 -
 -// The human readable string
 -$OC_VersionString='7.0.11 RC2';
 -
 -// The ownCloud edition
 -$OC_Edition='';
 -
 -// The ownCloud channel
 -$OC_Channel='git';
 -
 -// The build number
 -$OC_Build='';
 -
 +<?php 
- $OC_Version = array(7,0,11,0);
- $OC_VersionString = '7.0.11 RC1';
++$OC_Version = array(7,0,11,1);
++$OC_VersionString = '7.0.11 RC2';
 +$OC_Edition = '';
 +$OC_Channel = 'testing';
- $OC_Build = '2015-10-22T00:01:48+00:00 df9b8cdd7f402271ed1c905970f4c41c39aa8dbc';
++$OC_Build = '2015-10-28T16:07:48+00:00 912e346229f358bb7166e4d5befff3beafa5b576';

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git