152 Commits

Author SHA1 Message Date
Peter
e2f19e6b03 no message 2017-07-14 15:25:56 +03:00
Peter
aa5346e28a no message 2017-06-27 19:27:25 +03:00
Peter
034531e433 Merge commit '63e4c7271a121beabf77b4620ffb26b06e571aed' 2017-06-21 01:01:04 +03:00
Peter
9228beb5be no message 2017-06-21 01:00:53 +03:00
overtake
63e4c7271a no message 2017-06-20 18:02:57 +03:00
overtake
5995a01bd3 Merge branch 'master' of https://github.com/peter-iakovlev/Postbox 2017-06-19 20:39:46 +03:00
Peter
4a004016c0 no message 2017-06-19 20:36:07 +03:00
overtake
535446e352 Merge branch 'master' of https://github.com/peter-iakovlev/Postbox 2017-06-18 16:47:54 +03:00
Peter
d1daff6b1e no message 2017-06-18 16:26:27 +03:00
overtake
c09f88d732 Merge branch 'master' of https://github.com/peter-iakovlev/Postbox 2017-06-16 12:18:45 +03:00
Peter
b96742a0d4 no message 2017-06-16 12:15:42 +03:00
overtake
75ee44149e Merge branch 'master' of https://github.com/peter-iakovlev/Postbox 2017-06-13 22:23:09 +03:00
Peter
cdef6a6b99 no message 2017-06-13 22:22:21 +03:00
overtake
d294e15e16 Merge branch 'master' of https://github.com/peter-iakovlev/Postbox 2017-06-06 13:00:05 +03:00
Peter
10e3a2188b no message 2017-06-06 12:56:45 +03:00
overtake
357ddd05d3 - localisation and release version 2017-06-05 14:03:41 +03:00
Peter
0d09c23569 Merge commit 'b61e408cd853af4802927dd89245d843f423c9a3'
# Conflicts:
#	Postbox/Coding.swift
2017-05-26 13:11:00 +03:00
Peter
0677381484 no message 2017-05-26 13:09:35 +03:00
overtake
b61e408cd8 secret chat bug fixes 2017-05-11 20:27:07 +03:00
Peter
33c847b71b no message 2017-05-09 20:50:07 +03:00
overtake
23bccb2d6d - a lot of changes and features 2017-04-28 11:31:00 +03:00
overtake
ffcee2cec0 Merge branch 'master' of https://github.com/peter-iakovlev/Postbox 2017-04-27 23:26:21 +03:00
overtake
17935702ca no message 2017-04-27 23:26:14 +03:00
Peter
a73bcc3180 no message 2017-04-27 22:47:14 +03:00
overtake
a3ba5f3043 no message 2017-04-20 18:45:56 +03:00
Peter
b19a770951 no message 2017-04-18 20:05:09 +03:00
Peter
0e0646ddc9 no message 2017-04-14 16:04:22 +03:00
Peter
cd0476e1cc no message 2017-04-13 20:43:34 +03:00
Peter
69ebab9369 Merge commit '43b0f15d00ea909280bf0ac9414aa40d9b2a4fbd' 2017-04-12 13:02:40 +03:00
Peter
1dcf9ee2eb no message 2017-04-12 13:02:33 +03:00
overtake
43b0f15d00 Merge branch 'master' of https://github.com/peter-iakovlev/Postbox 2017-04-09 19:06:39 +03:00
Peter
b0e511bea6 no message 2017-04-09 16:32:13 +03:00
overtake
e43f479b7c Merge branch 'master' of https://github.com/peter-iakovlev/Postbox
Conflicts:
	Postbox/SqliteInterface.swift
2017-04-08 18:06:22 +03:00
Peter
403a723c6f no message 2017-04-08 17:22:56 +03:00
overtake
b192142d34 changes 2017-04-03 16:15:42 +03:00
overtake
81c4b66e31 Merge branch 'master' of https://github.com/peter-iakovlev/Postbox 2017-04-01 16:50:36 +03:00
Peter
bd4e29ecbe no message 2017-04-01 16:48:13 +03:00
overtake
9dc3fb98a5 Merge branch 'master' of https://github.com/peter-iakovlev/Postbox 2017-04-01 16:23:42 +03:00
Peter
3fb0dc5421 no message 2017-04-01 16:19:54 +03:00
overtake
4e95d00c46 Merge branch 'master' of https://github.com/peter-iakovlev/Postbox 2017-03-30 18:16:55 +03:00
overtake
6aba279ef7 no message 2017-03-30 18:16:49 +03:00
Peter
13bc5bbebc no message 2017-03-30 18:00:34 +03:00
Peter
4847a6ca82 no message 2017-03-28 21:44:41 +03:00
Peter
04d78772be no message 2017-03-23 21:26:23 +03:00
overtake
7227f38311 Merge branches 'master' and 'master' of https://github.com/peter-iakovlev/Postbox 2017-03-21 14:40:28 +03:00
Peter
4b1fb83ae7 no message 2017-03-21 14:37:01 +03:00
overtake
0b7bf07482 no message 2017-03-21 14:35:39 +03:00
overtake
e12aaa6f62 Merge branch 'master' of https://github.com/peter-iakovlev/Postbox 2017-03-20 18:37:59 +03:00
Peter
7b231edd2f no message 2017-03-20 18:37:15 +03:00
overtake
fd5c1ecd50 Merge branch 'master' of https://github.com/peter-iakovlev/Postbox 2017-03-18 17:59:25 +03:00