BFN

Conflicts: kronolith/docs/CHANGES kronolith/package.xml mnemo/package.xml
horde · Jul 28, 2014 · 6157750 · 6157750
1 parent ef9bfe1
commit 6157750
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/kronolith/docs/CHANGES b/kronolith/docs/CHANGES
@@ -9,6 +9,9 @@ v4.3.0-git
 v4.2.1
 ------
 
+=======
+[mjr] Ensure default share attribute is set when auto determining a default
+      share.
 [mjr] Fix fatal error when calculating alarms on a recurring event that has
       completed.
 [mjr] Fix catching minical clicks on browsers that return element names in

diff --git a/kronolith/package.xml b/kronolith/package.xml
@@ -33,7 +33,9 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
-* [jan] Add importing of calendar data from a URL.
+* [mjr] Ensure default share attribute is set when auto determining a default share.
+* [mjr] Fix fatal error when calculating alarms on a recurring event that has completed.
+* [mjr] Fix catching minical clicks on browsers that return element names in uppercase (Bug #13370, Jasper.Olbrich@students.uni-marburg.de).
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -2421,6 +2423,7 @@
    <date>2014-07-08</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [mjr] Ensure default share attribute is set when auto determining a default share.
 * [mjr] Fix fatal error when calculating alarms on a recurring event that has completed.
 * [mjr] Fix catching minical clicks on browsers that return element names in uppercase (Bug #13370, Jasper.Olbrich@students.uni-marburg.de).
    </notes>

diff --git a/mnemo/docs/CHANGES b/mnemo/docs/CHANGES
@@ -7,6 +7,8 @@ v4.3.0-git
 v4.2.1
 ----------
 
+[mjr] Ensure default share attribute is set when auto determining a default
+      share.
 [mjr] Fix showing the notepad name in list view when show_notepad preference is
       set (Bug #13352).
 [mjr] Add EAS client created shares to the sync_notpads preference (Bug

diff --git a/mnemo/package.xml b/mnemo/package.xml
@@ -1216,6 +1216,7 @@
    <date>2014-07-08</date>
    <license uri="http://www.horde.org/licenses/apache">ASL</license>
    <notes>
+* [mjr] Ensure default share attribute is set when auto determining a default share.
 * [mjr] Fix showing the notepad name in list view when show_notepad preference is set (Bug #13352).
 * [mjr] Add EAS client created shares to the sync_notpads preference (Bug #13359).
 * [mjr] Add missing API support for searchTags API (Bug #13361).