diff options
| author | Greg Aker <greg@gregaker.net> | 2011-08-20 18:58:58 +0200 |
|---|---|---|
| committer | Greg Aker <greg@gregaker.net> | 2011-08-20 18:58:58 +0200 |
| commit | abbad9ea53e81c6e3211029711ac5b2ab4f1978d (patch) | |
| tree | 9a4d5a8587da1dd3a365251afa37be2f835a53c2 /application/config/smileys.php | |
| parent | 71644d683d0a15a6f7e04fabd0f51a4200d620b4 (diff) | |
| parent | d56be70257696d0bbf2dcc880888d8dc17cba21c (diff) | |
Merge branch 'develop' into feature/unit-tests
Conflicts:
.hgignore
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 5b2964e24..25d28b2c4 100644 --- a/application/config/smileys.php +++ b/application/config/smileys.php @@ -1,10 +1,10 @@ -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); /* | ------------------------------------------------------------------- | 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 simileys. For example: | :-) and :) use the same image replacement. | | Please see user guide for more info: |