533 Commits

Author SHA1 Message Date
Peter
935a534de5 Merge commit '35859bfe7b9dfb137b5462f76db32d276357ad60' 2017-03-16 00:10:27 +03:00
Peter
b90f3bc405 no message 2017-03-16 00:10:21 +03:00
overtake
35859bfe7b changes 2017-03-15 21:21:24 +03:00
Peter
b74ce8978d no message 2017-03-15 19:05:03 +03:00
overtake
3521580e99 fingerprint fix 2017-03-15 17:24:03 +03:00
Peter
b53ab405dc no message 2017-03-15 16:53:33 +03:00
Peter
3a31aa07f3 no message 2017-03-15 16:25:21 +03:00
Peter
b5e9acd96c Merge commit '657567195261427c43f77d40bc9808b2cc47f157' 2017-03-15 13:33:12 +03:00
Peter
8a2f76f328 no message 2017-03-15 13:32:53 +03:00
overtake
6575671952 some changes 2017-03-15 00:43:20 +03:00
Peter
652832e32b Merge commit '3ca08f7aae8e4c108730926be5954d371b4d5ef7'
# Conflicts:
#	TelegramCore/StoreMessage_Telegram.swift
2017-03-14 17:22:32 +03:00
Peter
b7bd388ff4 no message 2017-03-14 17:21:25 +03:00
overtake
3ca08f7aae forward messages fro channel with unsigned messages 2017-03-14 17:14:49 +03:00
overtake
edd14a8f41 no message 2017-03-13 19:43:35 +03:00
overtake
02269ab60e Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-03-12 21:07:50 +03:00
Peter
6457c89007 no message 2017-03-12 21:03:01 +03:00
overtake
f99074c62d for migration 2017-03-12 19:04:13 +03:00
overtake
ff5c66e7bb Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-03-12 19:03:56 +03:00
Peter
44ff4fe420 no message 2017-03-12 19:01:07 +03:00
overtake
94ec63f287 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-03-12 15:19:17 +03:00
Peter
e840d27434 no message 2017-03-12 13:28:38 +03:00
overtake
d3a0226f72 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore
Conflicts:
	TelegramCore/ProcessSecretChatIncomingDecryptedOperations.swift
2017-03-10 21:43:46 +03:00
overtake
678236b6bc - no message 2017-03-10 21:43:11 +03:00
Peter
c4021393ea no message 2017-03-10 21:34:58 +03:00
overtake
98e376cdd7 passcode 2017-03-09 10:22:57 +03:00
Peter
6e6a71dabb Merge commit '056de30392d16a29cce16c0a240271f30093e528' 2017-03-09 01:02:30 +03:00
Peter
18fae85e67 no message 2017-03-09 01:02:25 +03:00
overtake
056de30392 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-03-08 09:10:09 +03:00
Peter
deca9e61de no message 2017-03-08 01:05:38 +03:00
Peter
f5c7871b05 no message 2017-03-08 01:03:20 +03:00
overtake
4985373538 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-03-07 18:00:35 +03:00
Peter
624b6e160f no message 2017-03-07 18:00:11 +03:00
overtake
16ce327863 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-03-07 16:12:00 +03:00
Peter
55d3f0cc75 no message 2017-03-07 16:10:43 +03:00
overtake
4508ce5278 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-03-07 16:00:35 +03:00
overtake
86d259e7c9 check media changes after copy to mediabox 2017-03-07 15:58:57 +03:00
Peter
976f82204d Merge commit 'c63302459dbfd7c543b9bd7260f53eb3c34bacb6' 2017-03-07 15:58:40 +03:00
Peter
9af14df09e no message 2017-03-07 15:58:35 +03:00
overtake
c63302459d - no message 2017-03-07 10:09:50 +03:00
overtake
dafd483f1c Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-03-07 01:37:46 +03:00
Peter
d57b82cc15 no message 2017-03-07 01:36:18 +03:00
overtake
3665a36fea Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-03-06 21:47:28 +03:00
Peter
d6025daae8 no message 2017-03-06 21:43:07 +03:00
overtake
e41b8bfe47 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-03-06 18:37:15 +03:00
overtake
37d74068d1 delplyment target changes to 10.11 2017-03-06 18:37:10 +03:00
Peter
f5a6cfdc1b Merge commit '4c7d17b3dd6c6450058e9e8822e56134832a7059' 2017-03-06 17:23:07 +03:00
Peter
91ed2e4bd0 no message 2017-03-06 17:22:54 +03:00
overtake
4c7d17b3dd import fixes 2017-03-06 14:35:06 +03:00
Peter
49d1aea8d2 no message 2017-03-06 02:11:11 +03:00
Peter
ca74503c28 no message 2017-03-06 01:16:00 +03:00