ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-11-30 03:44:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
756 Commits 3 Branches 294 Tags
Commit Graph

706 Commits

Author SHA1 Message Date
Mikhail Filimonov
6ef7309273 Merge branch 'feature/secureid' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 2018-04-20 13:18:11 +04:00
Peter Iakovlev
b081acd134 no message 2018-04-20 13:17:30 +04:00
Mikhail Filimonov
3a4698f25c Merge branch 'feature/secureid' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 
# Conflicts:
#	TelegramCore/ProxySettings.swift
 2018-04-20 13:16:36 +04:00
Mikhail Filimonov
55fc872b99 no message 2018-04-20 13:15:08 +04:00
Peter Iakovlev
54bf8761d7 no message 2018-04-20 13:14:30 +04:00
Mikhail Filimonov
53e5723155 Merge branch 'feature/secureid' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 2018-04-18 19:27:23 +04:00
Mikhail Filimonov
e57a68cd04 no message 2018-04-18 19:27:14 +04:00
Peter Iakovlev
abd8b9eb43 no message 2018-04-18 19:27:06 +04:00
overtake
9cc3444039 Merge branch 'feature/secureid' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 
* 'feature/secureid' of https://github.com/peter-iakovlev/TelegramCoreDev:
  no message
 2018-04-11 21:14:43 +03:00
Peter
16e6348b7e no message 2018-04-11 22:13:47 +04:00
overtake
76eb901afe no message 2018-04-11 20:45:03 +03:00
Peter
e4eb30e7dc no message 2018-04-10 14:14:37 +03:00
Peter
576d76dbf5 no message 2018-04-05 20:57:03 +03:00
Peter Iakovlev
2890cc554c no message 2018-04-03 19:36:22 +04:00
Peter Iakovlev
2a22161d4d no message 2018-04-03 16:19:15 +04:00
Peter Iakovlev
42890de382 no message 2018-04-03 15:25:45 +04:00
Peter Iakovlev
a3168cc1ce no message 2018-03-30 20:27:37 +04:00
Peter Iakovlev
37260e5d63 no message 2018-03-30 14:26:55 +04:00
Peter Iakovlev
edc33d40db no message 2018-03-30 14:20:02 +04:00
Peter Iakovlev
4a2705d051 no message 2018-03-30 03:53:50 +04:00
Peter Iakovlev
efc5ff8e98 no message 2018-03-30 00:09:24 +04:00
Peter Iakovlev
9fa93177cf no message 2018-03-29 19:07:05 +04:00
Peter Iakovlev
d6603fac7a Merge commit '077f9e89ef7f8f042cf025445ccdaef47b07abf2' into feature/secureid 2018-03-28 22:34:07 +04:00
Peter Iakovlev
13eb471286 no message 2018-03-28 22:33:33 +04:00
Peter Iakovlev
dc750fee3e no message 2018-03-28 22:33:08 +04:00
Mikhail Filimonov
077f9e89ef Merge branch 'feature/secureid' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 2018-03-28 22:13:49 +04:00
Mikhail Filimonov
e91ca3f86b no message 2018-03-28 22:13:42 +04:00
Peter Iakovlev
0182321637 no message 2018-03-28 21:36:06 +04:00
Mikhail Filimonov
e425c69db4 Merge branch 'feature/secureid' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 2018-03-28 16:01:41 +04:00
Peter Iakovlev
152a139727 no message 2018-03-28 15:01:20 +04:00
Peter Iakovlev
671fb6dd7e no message 2018-03-27 12:58:03 +04:00
Peter Iakovlev
33cc8132be no message 2018-03-27 12:03:39 +04:00
Peter Iakovlev
d67854a097 no message 2018-03-23 03:11:22 +04:00
Peter Iakovlev
bd1ab209ab no message 2018-03-21 00:58:01 +04:00
Mikhail Filimonov
c1f26363fd Merge branch 'feature/secureid' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 2018-03-21 00:01:24 +04:00
Peter Iakovlev
2bf793676c no message 2018-03-20 23:10:46 +04:00
Mikhail Filimonov
6ad54f3920 Merge branch 'master' into feature/secureid 
# Conflicts:
#	TelegramCore.xcodeproj/project.pbxproj
 2018-03-20 17:02:27 +04:00
Peter Iakovlev
257a4bac1b no message 2018-03-20 16:43:29 +04:00
Peter Iakovlev
5eeaed40c2 no message 2018-03-20 16:08:15 +04:00
Mikhail Filimonov
adcfd33024 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCoreDev 2018-03-13 23:44:00 +04:00
Peter Iakovlev
3426ba2972 no message 2018-03-13 22:44:44 +04:00
Mikhail Filimonov
a2094a07ec Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCoreDev 
# Conflicts:
#	TelegramCore/SearchMessages.swift
 2018-03-13 22:19:31 +04:00
Mikhail Filimonov
b000e1d943 no message 2018-03-13 22:18:22 +04:00
Peter Iakovlev
088674abd0 no message 2018-03-13 22:14:18 +04:00
Peter Iakovlev
bfe30a0f9c no message 2018-03-13 21:40:16 +04:00
Peter
96a5ec6ecc no message 2018-03-12 22:53:08 +04:00
Mikhail Filimonov
94931f7f6f Merge commit 'a277b328f8b883093e8331e819ad7196945d3264' into group_calls 2018-03-07 21:32:02 +04:00
Mikhail Filimonov
da55972d05 no message 2018-03-07 18:36:29 +04:00
Peter
a277b328f8 no message 2018-03-07 15:21:40 +01:00
Mikhail Filimonov
06f36dc334 Merge branch 'group_calls' of https://github.com/peter-iakovlev/TelegramCoreDev into group_calls 2018-03-03 20:39:59 +04:00