You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by ia...@apache.org on 2016/08/09 11:23:06 UTC
[20/28] incubator-taverna-mobile git commit: Merge branch 'master'
into Login
Merge branch 'master' into Login
# Conflicts:
# app/src/main/java/org/apache/taverna/mobile/activities/LoginActivity.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/commit/709ddca3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/709ddca3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/709ddca3
Branch: refs/heads/master
Commit: 709ddca30726b92297bff7bb687c127b3b19d9f5
Parents: 002c567 3748cdf
Author: Sagar <ku...@gmail.com>
Authored: Tue Aug 2 23:41:58 2016 +0530
Committer: Sagar <lu...@Sagar.local>
Committed: Tue Aug 2 23:41:58 2016 +0530
----------------------------------------------------------------------
.../mobile/activities/DashboardMainActivity.java | 8 +++++---
.../taverna/mobile/activities/RunResult.java | 4 ++--
.../mobile/activities/SettingsActivity.java | 18 ++++++------------
.../mobile/activities/WorkflowDetailActivity.java | 8 +++++---
4 files changed, 18 insertions(+), 20 deletions(-)
----------------------------------------------------------------------