Merge branch 'master' into develop

f7210153 · Jens Segers · 07bd2004 · f2cc0501 · f7210153
Commit f7210153 authored Nov 08, 2013 by Jens Segers
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

ModelTest.php tests/ModelTest.php +0 -2

No files found.
--- a/tests/ModelTest.php
+++ b/tests/ModelTest.php
 <?php
-use Carbon;
 class ModelTest extends PHPUnit_Framework_TestCase {
 	public function setUp() {}