Merge remote-tracking branch 'upstream/develop' for Release 304

orsee · Sep 4, 2015 · 1f273be · 1f273be
2 parents 9f75d90 + c4a4db6
commit 1f273be
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/test_file1.txt b/test_file1.txt
@@ -7,3 +7,4 @@ a
 test
 new feature 1
 new feature 3
+new feature 5
diff --git a/test_file2.txt b/test_file2.txt
@@ -1,4 +1,4 @@
-v303
+v304
 Hi
 3333
 4444
@@ -13,3 +13,4 @@ figure!
 Little tiny bug, I got you!
 Feature 2
 Feature 4
+Feature 6