| Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
vichan-devel-4.5
Conflicts:
inc/config.php
install.php
post.php
stylesheets/style.css
|
|
|
|
|
|
|
|
vichan-devel-4.5
Conflicts:
inc/config.php
inc/display.php
inc/mod/pages.php
install.php
js/quick-reply.js
post.php
templates/index.html
|
|
|
|
|
|
|
|
|
|
$config['filters'].
|
|
|
|
|
|
Conflicts:
install.php
|
|
|
|
|
|
|
|
Conflicts:
inc/config.php
inc/functions.php
install.php
stylesheets/dark_roach.css
|
|
a little quicker
|
|
|
|
templates/cache.
|
|
Conflicts:
stylesheets/dark_roach.css
stylesheets/style.css
|
|
|
|
|
|
|
|
|
|
Conflicts:
install.php
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
inc/image.php
|
|
|
|
Conflicts:
inc/config.php
inc/functions.php
templates/generic_page.html
templates/index.html
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
inc/functions.php
inc/mod/pages.php
install.php
js/expand.js
mod.php
|
|
|