[Pkg-owncloud-commits] [owncloud] 03/06: Imported Upstream version 7.0.12~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 b1d26140ace493ec55ea7c6cd23532bb1a5f9606
Merge: 571bda9 5557f68
Author: David Prévot <taffit at debian.org>
Date:   Mon Dec 21 16:10:36 2015 -0400

    Imported Upstream version 7.0.12~dfsg

 version.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --cc version.php
index 09e2582,32ec1f9..ede4ab9
--- 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, 12, 2);
 -
 -// The human readable string
 -$OC_VersionString='7.0.12';
 -
 -// The ownCloud edition
 -$OC_Edition='';
 -
 -// The ownCloud channel
 -$OC_Channel='git';
 -
 -// The build number
 -$OC_Build='';
 -
 +<?php 
- $OC_Version = array(7,0,12,0);
- $OC_VersionString = '7.0.12 RC1';
++$OC_Version = array(7,0,12,2);
++$OC_VersionString = '7.0.12';
 +$OC_Edition = '';
- $OC_Channel = 'testing';
- $OC_Build = '2015-12-16T00:06:01+00:00 f0032bd7b58b25773b89776f624b745dea2066c8';
++$OC_Channel = 'stable';
++$OC_Build = '2015-12-21T14:30:44+00:00 5557f6835db7e04b77a43547583e0e2d546ab550';

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