Marc Delisle 836529be42 Fix merge conflicts

2013-07-28 05:55:40 -04:00

..

frames

Remove other .htaccess for directories which are not at risk

2013-07-17 15:25:53 -04:00

lib

Remove other .htaccess for directories which are not at risk

2013-07-17 15:25:53 -04:00

ajax.js

Fixed bug #3583240 - /setup: AJAX is not defined

2012-11-04 13:07:07 +00:00

config.php

…

index.php

Include minified versions JS in git of jQuery and jQuery-UI

2013-07-08 13:00:16 +02:00

scripts.js

many some minor fixes (sorry, see diff)

2013-01-26 15:35:29 +03:00

styles.css

Saner color for error messages (and consistent with default theme)

2012-08-13 14:17:06 +02:00

validate.php

…