Commit graph

4 commits

Author SHA1 Message Date
Michael Vogel aed28a24f1 Merge remote-tracking branch 'upstream/master'
Conflicts:
	mod/crepair.php
2014-01-05 16:22:42 +01:00
Michael Vogel 4b0e370c4c Better handling of the network field in the item table. 2013-12-27 01:58:21 +01:00
Tobias Diekershoff 5113885427 fix 540 in vier 2013-05-29 17:10:49 +02:00
Fabrixxm 379c761c3f missing "templates" folders 2013-04-23 07:47:57 -04:00