tdesktop/.travis
John Preston 520260f207 Merge branch 'profile' into drafts
Conflicts:
	Telegram/SourceFiles/app.cpp
	Telegram/SourceFiles/codegen/style/processor.cpp
	Telegram/SourceFiles/history.cpp
	Telegram/SourceFiles/historywidget.cpp
	Telegram/SourceFiles/mainwidget.cpp
	Telegram/SourceFiles/mainwidget.h
	Telegram/SourceFiles/profilewidget.cpp
	Telegram/SourceFiles/profilewidget.h
	Telegram/Telegram.vcxproj
	Telegram/Telegram.vcxproj.filters
2016-06-06 18:16:52 +03:00
..
arch.sh Update arch.sh to latest version from upstream 2016-05-08 17:55:01 +02:00
build.sh Fix travis-scripts to support prev commit 2016-05-08 14:17:28 +06:00
check.sh Check commit message 2016-03-30 23:47:25 +02:00
common.sh Fix travis-scripts to support prev commit 2016-05-08 14:17:28 +06:00