From: masensio Date: Wed, 16 Sep 2015 09:44:51 +0000 (+0200) Subject: Merge branch 'fix_file_list_icon_alignment' of github.com:owncloud/android into fix_f... X-Git-Tag: oc-android-1.8~6^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/0083936d40ba55029daeee4f03f7bbb23411a75e?hp=c6bc82d4fe3cd185d2faad1a5786eade5399102b Merge branch 'fix_file_list_icon_alignment' of github.com:owncloud/android into fix_file_list_icon_alignment --- diff --git a/SETUP.md b/SETUP.md index 59a51cab..0f1bc8ed 100644 --- a/SETUP.md +++ b/SETUP.md @@ -36,7 +36,7 @@ Next steps will assume you have a Github account and that you will get the code * Open a terminal and go on with the next steps in it. * Clone your forked repository: ```git clone git@github.com:YOURGITHUBNAME/android.git```. * Move to the project folder with ```cd android```. -* Checkout the remote branch 'master' in your own local branch 'master': ```git checkout -b master remotes/origin/master```. +* Checkout the remote branch 'master' in your own local branch 'master': ```git checkout master remotes/origin/master```. * Pull any changes from your remote branch 'master': ```git pull origin master``` * Make official ownCloud repo known as upstream: ```git remote add upstream git@github.com:owncloud/android.git``` * Make sure to get the latest changes from official android/master branch: ```git pull upstream master``` diff --git a/doc/oCC2015_Android_workshop.odp b/doc/oCC2015_Android_workshop.odp index 104d2233..29ed242a 100644 Binary files a/doc/oCC2015_Android_workshop.odp and b/doc/oCC2015_Android_workshop.odp differ