Merge branch 'hotfix/35'

Close #35
phly · Feb 17, 2015 · b98a55e · b98a55e
2 parents dd76e39 + e5ffdbb
commit b98a55e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 vendor/
 composer.lock
+phpunit.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,8 @@ signature changes in `Phly\Conduit\Http\Request`.
 
 - [#34](https://github.com/phly/conduit/pull/34) Remove unused variable from
   test bootstrap.
+- [#35](https://github.com/phly/conduit/pull/35) Rename `phpunit.xml` to
+  `phpunit.xml.dist`.
 
 ## 0.13.0 - 2015-01-28
 

diff --git a/phpunit.xml → phpunit.xml.dist b/phpunit.xml → phpunit.xml.dist