Georg Ehrke 4c2cf35050 fix merge conflicts		2012-04-22 13:19:12 +02:00
..
delete.php	fix merge conflicts	2012-04-22 13:19:12 +02:00
edit.form.php	fix merge conflicts	2012-04-22 13:19:12 +02:00
edit.php	fix merge conflicts	2012-04-22 13:19:12 +02:00
move.php	fix merge conflicts	2012-04-22 13:19:12 +02:00
new.form.php	fix merge conflicts	2012-04-22 13:19:12 +02:00
new.php	remove the require_once lib base from all (or nearly all) files	2012-04-17 19:31:29 +02:00
resize.php	fix merge conflicts	2012-04-22 13:19:12 +02:00