Merge branch 'tgl-test' of github.com:majn/telegram-purple into tgl-test

Browse source

Conflicts:
	.gitignore
	Makefile
	telegram-base.c
	telegram-purple.c

...

This commit is contained in:

Vysheng 2014-11-12 21:37:09 +03:00

parent 5b4f1cd450 8ebbdfbaff

commit 8bdf22648d

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 is not available