Merge tag 'v1.0-5'

- Use Travis instead of wercker. - Criteria can be combined with the `|` operator (#15).
r-lib · Oct 22, 2016 · 7d7477b · 7d7477b
2 parents 8bacbd3 + 45c1ce1
commit 7d7477b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: rprojroot
 Title: Finding Files in Project Subdirectories
-Version: 1.0-4
+Version: 1.0-5
 Authors@R: person(given = "Kirill", family = "Müller", role = c("aut",
         "cre"), email = "krlmlr+r@mailbox.org")
 Description: Robust, reliable and flexible paths to files below a

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,9 @@
+## rprojroot 1.0-5 (2016-10-22)
+
+- Use Travis instead of wercker.
+- Criteria can be combined with the `|` operator (#15).
+
+
 ## rprojroot 1.0-4 (2016-05-30)
 
 - Improve AppVeyor testing.