um, I may have merged some of the changes in stable4 back into master while adding the oracle support. I hope I was not totally wrong when assuming we were merging the fixes in stable back to master.
Can we agree on a branching model like http://nvie.com/posts/a-successful-git-branching-model/ then hopefully it will be clearer what goes where and when ... add an example git tutorial for a new feature, a new release and keeping the local changes up to date with development and we have a clear description for our developers on how oncloud uses git. n8 Jörn -- Jörn Friedrich Dreyer (j...@owncloud.com) Software Developer ownCloud GmbH Your Data, Your Cloud, Your Way! ownCloud GmbH, GF: Markus Rex, Holger Dyroff Schloßäckerstrasse 26a, 90443 Nürnberg, HRB 28050 (AG Nürnberg) _______________________________________________ Owncloud mailing list Owncloud@kde.org https://mail.kde.org/mailman/listinfo/owncloud