Merge branch 'master' into develop

Browse Source

# Conflicts:
#	README.md
#	TableKitDemo/TableKitDemo.xcodeproj/project.pbxproj

...

This commit is contained in:

Max Sokolov 2016-06-11 12:33:22 +03:00

parent e3ddb25b22 e096889819

commit 0463cfdf40

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available