summaryrefslogtreecommitdiffstats
path: root/application/config/smileys.php
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2011-10-05 19:24:45 +0200
committerDerek Jones <derek.jones@ellislab.com>2011-10-05 19:24:45 +0200
commit044a5221843cc2d88b936f3e658a1df4bc28cfe2 (patch)
tree9845376e277aa822c41835c8ca8bc94a4cf23756 /application/config/smileys.php
parent47a62548cfdcd5fb6588a2caa92d3b55ac05de6f (diff)
parentd1ecd5cd4ae6ab5d37df9fbda14b93977b9e743c (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'application/config/smileys.php')
-rw-r--r--application/config/smileys.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/application/config/smileys.php b/application/config/smileys.php
index 25d28b2c4..38f02a9e0 100644
--- a/application/config/smileys.php
+++ b/application/config/smileys.php
@@ -60,7 +60,7 @@ $smileys = array(
':exclaim:' => array('exclaim.gif', '19', '19', 'excaim'),
':question:' => array('question.gif', '19', '19', 'question') // no comma after last item
- );
+);
/* End of file smileys.php */
/* Location: ./application/config/smileys.php */ \ No newline at end of file