jgen 0bd031a269 Merge branch 'develop' of github.com:jgen/shimmie2 into linting ...

Manually resolved conflicts:
	ext/chatbox/js/yshout.js

2014-04-23 22:42:30 -04:00

..

cp

Again, the chatbox needs help from the jQuery migrate plugin.

2014-04-20 05:00:59 -04:00

css

Chatbox

2013-06-19 20:59:59 +01:00

history

Avoid short open tag for PHP.

2014-04-20 05:07:26 -04:00

js

Merge branch 'develop' of github.com:jgen/shimmie2 into linting

2014-04-23 22:42:30 -04:00

logs

Chatbox

2013-06-19 20:59:59 +01:00

php

Don't use short open tags for PHP as they are not turned on by default in production environments.

2014-04-20 05:00:34 -04:00

smileys

Chatbox

2013-06-19 20:59:59 +01:00

include.php

Don't use short open tags for PHP as they are not turned on by default in production environments.

2014-04-20 05:00:34 -04:00

main.php

Chatbox should be fixed now.

2014-04-20 04:51:19 -04:00

preferences.php

Don't use short open tags for PHP as they are not turned on by default in production environments.

2014-04-20 05:00:34 -04:00

yshout.php

Don't use short open tags for PHP as they are not turned on by default in production environments.

2014-04-20 05:00:34 -04:00