element-ios/matrixConsole/Assets
David Baker 0a5bd94799 Merge branch 'develop' into apns
Conflicts:
	samples/matrixConsole/matrixConsole.xcodeproj/project.pbxproj
2015-01-27 10:35:56 +00:00
..
en.lproj More messages for invites & things 2015-01-26 17:29:45 +00:00
close.png Rename directories of sample sources (matrixConsole) 2014-11-24 10:38:23 +01:00
default-profile.png Rename directories of sample sources (matrixConsole) 2014-11-24 10:38:23 +01:00
gradient.png Rename directories of sample sources (matrixConsole) 2014-11-24 10:38:23 +01:00
icon_keyboard.png FixRegression: typing badge was stretched 2015-01-16 11:27:01 +01:00
icon_keyboard@2x.png FixRegression: typing badge was stretched 2015-01-16 11:27:01 +01:00
icon_search.png Home: Add search option in public rooms 2014-12-08 09:32:21 +01:00
icon_search@2x.png Home: Add search option in public rooms 2014-12-08 09:32:21 +01:00
icon_users.png Room details: Improve members list icon 2014-12-15 17:41:40 +01:00
icon_users@2x.png Room details: Improve members list icon 2014-12-15 17:41:40 +01:00
logo.png Rename directories of sample sources (matrixConsole) 2014-11-24 10:38:23 +01:00
logoHighRes.png Rename directories of sample sources (matrixConsole) 2014-11-24 10:38:23 +01:00
matrixConsole.jpg Rename directories of sample sources (matrixConsole) 2014-11-24 10:38:23 +01:00
matrixUser.png -> Check if any contact contains a matrix email 2015-01-20 16:29:42 +01:00
play.png Rename directories of sample sources (matrixConsole) 2014-11-24 10:38:23 +01:00
tab_home.ico Rename directories of sample sources (matrixConsole) 2014-11-24 10:38:23 +01:00
tab_recents.png Rename directories of sample sources (matrixConsole) 2014-11-24 10:38:23 +01:00
tab_recents@2x.png Rename directories of sample sources (matrixConsole) 2014-11-24 10:38:23 +01:00