diff options
author | purandi <free6300@gmail.com> | 2011-09-04 14:51:23 +0200 |
---|---|---|
committer | purandi <free6300@gmail.com> | 2011-09-04 14:51:23 +0200 |
commit | ab0dbd4b992778678e00ea3f2a3dd4bf5f1ff504 (patch) | |
tree | 740d3cabe5e51f18578a72abf6e13e62fba9eb62 /application/config/smileys.php | |
parent | dcf3d1bf17e1354ff0a644f390ed590f2e65298b (diff) | |
parent | 2eb2557bf1c438d8fb7d612dbb76c6676eaec4d6 (diff) |
Merge branch 'develop', remote-tracking branch 'origin/develop' into develop
Diffstat (limited to 'application/config/smileys.php')
-rw-r--r-- | application/config/smileys.php | 2 |
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 |