Marius Cramer
2013-10-18 05beae43cfeb15ea89b984d36105dcdbdffd0975
refs
author Marius Cramer <m.cramer@pixcept.de>
Friday, October 18, 2013 09:16 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Friday, October 18, 2013 09:16 -0400
commit05beae43cfeb15ea89b984d36105dcdbdffd0975
tree 4e7024fb96b38e54edd3df99a3b4581e3b94ba53 tree | zip | gz
parent bd68aae78a5d696e4ccb9c0d267486c283a6d9d2 view | diff
Resolved differences from svn merge to trunk and git master
3 files modified
358 ■■■■■ changed files
interface/lib/classes/aps_guicontroller.inc.php 11 ●●●● diff | view | raw | blame | history
interface/lib/classes/tform.inc.php 174 ●●●● diff | view | raw | blame | history
server/mods-available/rescue_core_module.inc.php 173 ●●●● diff | view | raw | blame | history