summaryrefslogtreecommitdiff
path: root/history.txt
diff options
context:
space:
mode:
authorGubolin <gubolin@fantasymail.de>2015-03-08 09:53:10 +0100
committerGubolin <gubolin@fantasymail.de>2015-03-08 09:53:10 +0100
commitb6d846444e44d41842e253b7276cd590d7163349 (patch)
tree38fe02cc9cc336f5126773b88624ff70706dd521 /history.txt
parent808076ff0f36d87a514a56de747f0c937624e75d (diff)
parente906290f47face8f2f4cc318f5d11838fb8a3b0a (diff)
downloadsnap-b6d846444e44d41842e253b7276cd590d7163349.tar.gz
snap-b6d846444e44d41842e253b7276cd590d7163349.zip
Merge remote-tracking branch 'upstream/master' into development
Diffstat (limited to 'history.txt')
-rwxr-xr-xhistory.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/history.txt b/history.txt
index 0f92071..d042af4 100755
--- a/history.txt
+++ b/history.txt
@@ -2462,3 +2462,7 @@ ______
150302
------
* BYOB: fixed #730
+
+150306
+------
+* Blocks: fixed #736