summary refs log tree commit diff
path: root/nixos/doc/manual
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-06-10 10:35:50 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2019-06-10 10:35:50 +0200
commite58f0f6c997ab6e1b62f30aea5d9c1fb8ec628ad (patch)
tree1e346767b4a6882a24fe41f73a9cfd283c007aea /nixos/doc/manual
parent4416712772fbd893413342a2b8e5064c0c174b77 (diff)
parent80b51d983ae77f47910ba26305023efbfdb62e91 (diff)
downloadnixpkgs-e58f0f6c997ab6e1b62f30aea5d9c1fb8ec628ad.tar
nixpkgs-e58f0f6c997ab6e1b62f30aea5d9c1fb8ec628ad.tar.gz
nixpkgs-e58f0f6c997ab6e1b62f30aea5d9c1fb8ec628ad.tar.bz2
nixpkgs-e58f0f6c997ab6e1b62f30aea5d9c1fb8ec628ad.tar.lz
nixpkgs-e58f0f6c997ab6e1b62f30aea5d9c1fb8ec628ad.tar.xz
nixpkgs-e58f0f6c997ab6e1b62f30aea5d9c1fb8ec628ad.tar.zst
nixpkgs-e58f0f6c997ab6e1b62f30aea5d9c1fb8ec628ad.zip
Merge master into staging-next
Diffstat (limited to 'nixos/doc/manual')
-rw-r--r--nixos/doc/manual/release-notes/rl-1909.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 7f0c1d21e37..d7ae05086ed 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -23,6 +23,11 @@
      End of support is planned for end of April 2020, handing over to 20.03.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     PHP now defaults to PHP 7.3, updated from 7.2.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>