Re: [Tails-dev] Improving the bug reporting workflow

On 15/10/13 09:58, intrigeri wrote:
> Hi,
>
> sajolida@??? wrote (14 Oct 2013 20:54:53 GMT) :
>>> I worked more on that. I think this branch is now ready for a new round
>>> of testing and merge. This should be tested together with the
>>> feature/simplify_ikiwiki_setup branch. No tickets.
>
>> Now that feature/simplify_ikiwiki_setup is merged, this one could go
>> forward as well I guess.
>
> I was going to merge it, but it now contains new and unrelated
> changes, such as d99c9647. Is it really meant to be merged as-is?

Sorry. My work became a bit messy on this branch when it started to
interact with feature/simplify_ikiwiki_setup. Commit d99c9647 is now
actually overwritten by feature/simplify_ikiwiki_setup.

I remove the last two commits and force updated the branch to commit
f010de9. Now it should be better.