28 Jun
2012
28 Jun
'12
7:56 a.m.
Hi
Dne Thu, 28 Jun 2012 07:21:21 +0300 Alex Marin alex.ukf@gmail.com napsal(a):
Hi Michal,
On Mon, Jun 25, 2012 at 12:07 PM, Michal Čihař michal@cihar.com wrote:
Actually I was thinking about merging it, but it does not merge without conflicts. Can you please look at it?
I have merged the current master into my branch, and it should be safe now.
Okay, let's break master :-). Your code has been just merged.
--
Michal Čihař | http://cihar.com | http://phpmyadmin.cz