summaryrefslogtreecommitdiffstats
path: root/tests/README.md
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-05-16 21:39:14 +0200
committerTimothy Warren <tim@timshomepage.net>2012-05-16 21:39:14 +0200
commitf7f44584c7acb8be6097445529f09255bfe34e5d (patch)
treebb8760229e5113bca38d7505a475c1e6c62f2059 /tests/README.md
parentcb6c34eb5839d2b9c8d8ce70dcddde8931c0c277 (diff)
parentc59e8720177d96a1dec1b2cbcd6296bbfceb4a2b (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into email
Diffstat (limited to 'tests/README.md')
-rw-r--r--tests/README.md8
1 files changed, 1 insertions, 7 deletions
diff --git a/tests/README.md b/tests/README.md
index 6d83c34d8..c8fc608e8 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -1,12 +1,6 @@
# CodeIgniter Unit Tests #
-Status : [![Build Status](https://secure.travis-ci.org/EllisLab/CodeIgniter.png?branch=feature/unit-tests)](http://travis-ci.org/EllisLab/CodeIgniter)
-
-*Do not merge to default until these issues have been addressed*
-
-- Clean up naming conventions
-- Figure out config stuff
-- Figure out database testing
+Status : [![Build Status](https://secure.travis-ci.org/EllisLab/CodeIgniter.png?branch=develop)](http://travis-ci.org/EllisLab/CodeIgniter)
### Introduction: