]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge branch 'master' into debian-jessie-backports
authorSimon McVittie <smcv@debian.org>
Thu, 29 Dec 2016 20:47:46 +0000 (20:47 +0000)
committerSimon McVittie <smcv@debian.org>
Thu, 29 Dec 2016 20:47:46 +0000 (20:47 +0000)
1  2 
debian/changelog

index 0e36f05c235527d3fe6c0092aab5366efccc5975,99081bcb091be2824cbf0f17fa2747089d425069..1c989e5155ebfdd710ce919ff978886040f62e90
@@@ -1,12 -1,11 +1,20 @@@
+ ikiwiki (3.20161229.1) unstable; urgency=medium
+   * git: Attribute reverts to the user doing the revert, not the wiki
+     itself.
+   * git: Do not disable the commit hook while preparing a revert.
+  -- Simon McVittie <smcv@debian.org>  Thu, 29 Dec 2016 20:46:24 +0000
 +ikiwiki (3.20161229~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports
 +    - debian/tests/control: set INSTALLED_TESTS=1 here,
 +      pkg-perl-autopkgtest in jessie didn't support
 +      debian/tests/pkg-perl/smoke-env
 +
 + -- Simon McVittie <smcv@debian.org>  Thu, 29 Dec 2016 17:38:19 +0000
 +
  ikiwiki (3.20161229) unstable; urgency=medium
  
    * Security: force CGI::FormBuilder->field to scalar context where