diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-06-13 18:38:24 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-06-13 18:38:24 +0200 |
| commit | 0eebc808cb298cdc6cd81be93de306a44c523e75 (patch) | |
| tree | 837a7f92cead194db5892c61a45eca164e5af60e /user_guide/changelog.html | |
| parent | b55050962bb731d1a99430cd37953e55434236a9 (diff) | |
| parent | 686ff126762c0923556036a3cf73abb9390a7e67 (diff) | |
Fixed conflicts between git flow 2.1.1 and non-flow 2.1.1
Diffstat (limited to 'user_guide/changelog.html')
| -rw-r--r-- | user_guide/changelog.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/user_guide/changelog.html b/user_guide/changelog.html index ccec890e0..56fdba68a 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -1470,7 +1470,7 @@ Previous Topic: <a href="license.html">License Agreement</a> <a href="index.html">User Guide Home</a> · Next Topic: <a href="./general/credits.html">Credits</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> |