diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-01-20 14:03:43 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-01-20 14:03:43 +0100 |
| commit | ea801ab4ab80042638ffddc6056483a1ec43fa80 (patch) | |
| tree | f75f30c0df6a8f861ca7df22af09fa3240b0bbd6 /application/config/smileys.php | |
| parent | 1c08d557a21ecb0f79cd1a1de4e06817a26e0537 (diff) | |
| parent | 4d0571666d03511ac5b4a1f2a6882ccb1509a209 (diff) | |
Merge branch 'develop' into feature/user-guide-cleanup
Diffstat (limited to 'application/config/smileys.php')
| -rw-r--r-- | application/config/smileys.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/application/config/smileys.php b/application/config/smileys.php index 4b253098b..3c49c469e 100644 --- a/application/config/smileys.php +++ b/application/config/smileys.php @@ -30,7 +30,7 @@ | SMILEYS | ------------------------------------------------------------------- | This file contains an array of smileys for use with the emoticon helper. -| Individual images can be used to replace multiple simileys. For example: +| Individual images can be used to replace multiple smileys. For example: | :-) and :) use the same image replacement. | | Please see user guide for more info: @@ -84,7 +84,7 @@ $smileys = array( ':vampire:' => array('vampire.gif', '19', '19', 'vampire'), ':snake:' => array('snake.gif', '19', '19', 'snake'), ':exclaim:' => array('exclaim.gif', '19', '19', 'excaim'), - ':question:' => array('question.gif', '19', '19', 'question') // no comma after last item + ':question:' => array('question.gif', '19', '19', 'question') ); |