| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
include/zot.php
view/de/messages.po
view/de/strings.php
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
and/or site moves
|
|\ \ |
|
| | | |
|
| | | |
|
|/ /
| |
| |
| | |
messed up
|
| |
| |
| |
| | |
evaluated
|
| | |
|
| | |
|
|\| |
|
| | |
|
| | |
|
|\ \ |
|
| | | |
|
| | | |
|
| | | |
|
|/ /
| |
| |
| | |
drop
|
|\|
| |
| |
| |
| | |
Conflicts:
include/zot.php
|
| | |
|
|\|
| |
| |
| |
| |
| | |
Conflicts:
include/zot.php
util/messages.po
|
| | |
|
| | |
|
| |
| |
| |
| | |
endless merge conflicts.
|
| |
| |
| |
| | |
content-type of some form as imagick chucks a wobbly if you try to initialise an image with an html error page.
|
| | |
|
| | |
|
| |
| |
| |
| | |
delivery reports
|
|\ \ |
|
| | | |
|
|/ / |
|
| | |
|
| | |
|
| | |
|
|\| |
|
| | |
|
| | |
|
|\| |
|
| | |
|
|\| |
|
| | |
|
|\|
| |
| |
| |
| |
| | |
Conflicts:
include/items.php
include/zot.php
|
| | |
|
| |
| |
| |
| | |
doing it's thing
|