29 Jul
2010
29 Jul
'10
2:06 p.m.
Thanks for this message. I completely forgot about the Master. I merged my fork with the master and pushed the changes now.
2010/7/29 Herman van Rink rink@initfour.nl
Martynas,
I tried to merge the current master into your branch, just for the fun of it. Only server_status.php had a merge conflict, just the added require_once './libraries/chart.lib.php'; and it's comment block which interfered with another change. So maybe it's a good idea to merge master every now and then. I'd hate to have a problem later when we try to merge your tree back into master.
--
Met vriendelijke groet / Regards,
Herman van Rink Initfour websolutions