From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 2 Dec 2015 19:25:40 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/material_fab' into beta
X-Git-Tag: beta-20151202~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2eecb46250300a470fa20caee27b2b04a1e0ea49?hp=7326405ebb29a640388ebb9d782986ebf12e865f

Merge remote-tracking branch 'remotes/upstream/material_fab' into beta
---

diff --git a/THIRD_PARTY.txt b/THIRD_PARTY.txt
index 034ecb32..7b21bfc3 100644
--- a/THIRD_PARTY.txt
+++ b/THIRD_PARTY.txt
@@ -59,7 +59,7 @@ The third party software included and used by this project is:
    modifications com.ortiz.touch.ExtendedViewPager and com.ortiz.touch.TouchImageView classes. 
    See https://github.com/MikeOrtiz/TouchImageView
  
- * floatingactionbutton 1.10.0.
+ * floatingactionbutton 1.10.1.
    Copyright (c) 2014 Jerzy Chalupski
    Licensed under Apache License, Version 2.0.
    placed at libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar has been exploded by ownCloud Inc.