Commit graph

2 commits

Author SHA1 Message Date
SBiOSoftWhare
5ac652536b Merge branch 'develop' into convert_to_coordinators
# Conflicts:
#	CHANGES.rst
#	Riot/Modules/TabBar/MasterTabBarController.h
#	Riot/Modules/TabBar/MasterTabBarController.m
2020-09-24 11:37:24 +02:00
ismailgulek
0bcdb5adb0 Fix topic cell, introduce PlaceholderedTextView 2020-09-10 18:14:19 +03:00