summaryrefslogtreecommitdiffstats
path: root/user_guide/general/credits.html
diff options
context:
space:
mode:
authorPascal Kriete <pascal.kriete@ellislab.com>2010-11-04 22:59:52 +0100
committerPascal Kriete <pascal.kriete@ellislab.com>2010-11-04 22:59:52 +0100
commite917f9be8b05c81357c1c2c9730d5060685d644d (patch)
treeb6a7d5ce8ba57b69ba61454f77829b04f2ce5974 /user_guide/general/credits.html
parent5b2d2da5ae2e97043c6bef53e565d30e50196e2b (diff)
parente1f6e9ddff788f6a154f5f35dc117d14aeb0c484 (diff)
Automated merge with http://hg.ellislab.com/CodeIgniter2
Diffstat (limited to 'user_guide/general/credits.html')
-rw-r--r--user_guide/general/credits.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html
index b77528a7e..5423d5838 100644
--- a/user_guide/general/credits.html
+++ b/user_guide/general/credits.html
@@ -58,8 +58,8 @@ Credits
<h1>Credits</h1>
<p>CodeIgniter was originally developed by <a href="http://www.ellislab.com/">Rick Ellis</a> (CEO of
-<a href="http://ellislab.com/">EllisLab, Inc.</a>). The framework was written for performance in the real
-world, with many of the class libraries, helpers, and sub-systems borrowed from the code-base of
+<a href="http://ellislab.com/">EllisLab, Inc.</a>). The framework was written for performance in the real
+world, with many of the class libraries, helpers, and sub-systems borrowed from the code-base of
<a href="http://www.expressionengine.com/">ExpressionEngine</a>.</p>
<p>It is currently developed and maintained by the ExpressionEngine Development Team.</p>