tom79 9f711a9be5 Merge branch 'develop' into pixelfed_stories ... # Conflicts: # app/src/main/java/app/fedilab/android/client/APIResponse.java		2020-01-18 15:00:26 +01:00
..
Entities	Fix live notifications	2020-01-05 18:38:12 +01:00
Glide	Improve activity for bookmarks	2019-11-15 16:32:25 +01:00
API.java	Follow request Friendica	2019-12-21 13:22:51 +01:00
APIResponse.java	Merge branch 'develop' into pixelfed_stories	2020-01-18 15:00:26 +01:00
CustomSharing.java	Reformat code	2019-09-06 17:55:14 +02:00
CustomSharingResponse.java	Improve activity for bookmarks	2019-11-15 16:32:25 +01:00
GNUAPI.java	Follow request Friendica	2019-12-21 13:22:51 +01:00
HttpsConnection.java	Fix pin	2019-12-17 18:45:29 +01:00
PeertubeAPI.java	Some fixes & improvements	2019-12-04 11:39:49 +01:00
PixelfedAPI.java	Improve activity for bookmarks	2019-11-15 16:42:10 +01:00
TLSSocketFactory.java	Improve activity for bookmarks	2019-11-15 16:32:25 +01:00
Tls12SocketFactory.java	Improve activity for bookmarks	2019-11-15 16:32:25 +01:00