Merge branch 'vinkla-patch-2'

txthinking · Sep 29, 2016 · d243432 · d243432
2 parents c384252 + 27001aa
commit d243432
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ vendor/
 composer.lock
 .idea/
 docs/
+phpunit.xml
diff --git a/phpunit.xml → phpunit.xml.dist b/phpunit.xml → phpunit.xml.dist
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ vendor/ @@
     composer.lock
     .idea/
     docs/
+    phpunit.xml