Merging stable into master

Wed Oct 1 22:20:54 UTC 2014

On Wed, Oct 1, 2014 at 11:51 PM, Kai Uwe Broulik <kde at privat.broulik.de>
wrote:

> What's up with those translations though? Merging is no fun atm because I
> get merge conflicts in desktop files all the time.
>
> Is Scripty not running on master or something?
>

Translators prefer to translate stable, obviously.

If you follow the steps david suggested, merging will be fun again! :D

Aleix
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/plasma-devel/attachments/20141002/ebf4e756/attachment.html>