Max Sokolov afbb7154ca Merge branch 'master' into develop ... # Conflicts: # Tablet.podspec # Tablet/TableRowBuilder.swift		2016-03-20 23:07:13 +03:00
..
xcuserdata	Merge branch 'master' into develop	2016-03-20 23:07:13 +03:00
contents.xcworkspacedata	added tablet sources, xcode demo project setup	2015-11-08 15:34:35 +03:00