Merge branch 'master' into remove_error # Conflicts: # app/src/main/java/org/apache/taverna/mobile/ui/adapter/LicenceRecyclerViewAdapter.java # app/src/main/java/org/apache/taverna/mobile/ui/licences/licence/LicenceContent.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/44d516a7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/44d516a7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/44d516a7 Branch: refs/heads/master Commit: 44d516a7d3f5acca227adb02d76efcf266e3a5b0 Parents: 704aa7c 2a592b1 Author: Sagar <kumarsagar15...@gmail.com> Authored: Fri Oct 14 19:03:26 2016 +0530 Committer: Sagar <kumarsagar15...@gmail.com> Committed: Fri Oct 14 19:03:26 2016 +0530 ---------------------------------------------------------------------- .../mobile/ui/licences/LicenceFragment.java | 18 ++++++++++++++++++ app/src/main/res/layout/fragment_licence.xml | 16 ++++++++++++++++ app/src/main/res/layout/fragment_licence_list.xml | 16 ++++++++++++++++ 3 files changed, 50 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/44d516a7/app/src/main/java/org/apache/taverna/mobile/ui/licences/LicenceFragment.java ----------------------------------------------------------------------
