back to master!

[Boudewijn Rempt]

We're back to normal!

Unstable branch: master
Stable branch: krita/3.1

Jenkins and translations are setup for that now. Here's the workflow from now on:

* Big merges can be done during the merge window only (or after discussion on the meeting)

* Small string-changing fixes/features directly into master

* Bugfixes are pushed into release branch and cherry-picked into master

The merge window should be opened on Monday, and lasts two weeks, after that, it 
will close for four weeks. By then, we'll also start bringing out new development builds.

-- 
Boudewijn Rempt | http://www.krita.org, http://www.valdyas.org