[Qgis-community-team] QGIS-Documentation master now building on Travis

[Alexander Bruy]

But history seems messed. Not sure if this critical

2016-01-22 12:34 GMT+02:00 Alexander Bruy <alexander.bruy at gmail.com>:
> Looks good. Merge it
>
> 2016-01-22 12:27 GMT+02:00 Richard Duivenvoorde <richard at duif.net>:
>>
>> Hi Harrissou,
>>
>> I'm not that deep into the sources and git to determine. If nobody else
>> volunteers, I would just merge...
>>
>> Regards,
>>
>> Richard
>>
>> On 22-01-16 11:03, DelazJ wrote:
>>> Hi,
>>> Meanwhile, another commit (bb57ebe) adds more conflicts so I rather
>>> rebased on my PR. Travis seems happy and I keep all the changes.
>>> Given that it's the first time I do such a thing, if someone can check
>>> the history so that I could merge it, it'd be nice.
>>> There were pending questions in the PR but I'd like it merged before
>>> another commit breaks it again :( . These questions will be treated
>>> later or no.
>>>
>>> Regards,
>>> Harrissou
>>>
>>> 2016-01-20 16:04 GMT+01:00 Richard Duivenvoorde <richard at duif.net
>>> <mailto:richard at duif.net>>:
>>>
>>>     On 20-01-16 15:48, DelazJ wrote:
>>>     > Given that commit 04321162 is more about trailing space and my PR
>>>     > already includes the icon fix, does it sound good to revert commit
>>>     > 04321162 as quick fix?
>>>
>>>     I'm fine with that, can you try it out yourself first?
>>>
>>>     Richard
>>>
>>>
>>
>
>
>
> --
> Alexander Bruy



-- 
Alexander Bruy