From 2ebeffcf3e255407fa94ac99a245117b21b604b1 Mon Sep 17 00:00:00 2001
From: Anatoly <a.feteleu@spider.ru>
Date: Mon, 28 Oct 2019 12:34:37 +0300
Subject: [PATCH] Merge branch 'develop' of /home/a.feteleu/projects/gm-backend
 with conflicts.

---
 celerybeat-schedule | Bin 12845 -> 13471 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/celerybeat-schedule b/celerybeat-schedule
index 3efe528a0f0c9bb6e563876fdc4c1a02541e62f7..b8d3e3de18a9fcae15f3b9986a0be9fe2dcfa5aa 100644
GIT binary patch
literal 13471
zcmeI3O=}ZD7{@2sB%4ec+a@iFw#8dhp-XLxBK05?PoW}f#fadt*$nJrn)cb5h%E$i
zD*6>X=uJF|UqG*3dhzH<ym<25gP=1zlQxyoLxfu7$uRTG+s-h*edf=;W$)#K3K=6L
ziP9)rF!qhIw^TyNPZ_Nwr<0t?&o1apso!SG-%a`2)qVq7B!C2v01`j~NB{{S0VIF~
zkN^@u0!ZMW5x8t-Myo*}2jrj#pdX+gpda8qKpj9GKpj9GKpj9GKpj9G_|J48t9LaS
zHFjoEXD*s@$-K|sGv$Y-Jd@HD^QOOF)aBR9+I}`41oYcgZAQjl@~3+oO|f3{Kn}=Z
zaA%-DoQ^+y`Sf+x^PaMsM&Fd2m1RW!r^6pPBWFzjIUt8Y0y=-`@%x#M2)y|Lea7p_
zLr$olngwzgj)VW=M}@UTTwBt|+tRGbdpzVh9M2E$)-Q-1LT1hP?`b)Vx+OkqJk>dm
z81GqKAdb2Kj(N1%_Pm}|SC0mkoh4^Mwuqgcb;nTx%-VjV#hN|q`5)c${qAwFD3542
zy`aVXc4rGxLBLup-gX+y7xZ2bvSz2nZp)dsDWt1mDoh1UUoa7EFnW*yYn9sH?DNIx
z8|3aI$OK#4VuyP7*H<ZI=Um9`g6%@SM*5?3Gccz?yxA6hgF>NNSI;RHfF^bsiiy1f
zBcTieN-mu1!f0cz3u9dvuPd)-&$gnNaVW2Se9Hw?T$td=`s?cd4|00BxIt=lb%q(2
z^R*%#ZpbD_`1}cXV%F$Ht)_RR&5PR2D3HVd4HP<+o1RSXzZw=wZN*@qVG;xsT^Q*?
zNr6y61dO>b&K(XFO<}@?Nq!2;9ulS%TE}@%MtKmOvR4S%zYf_!56VdovUefxLZOyE
z!Gmb^09G+ff`AbhN|KX;H7XrPz_<(LvrK15s+r@MW;N6N3Q4g%<OZ4Al4*Vy3NFx^
Vbpq4kA=6|Z9<vh#lwGKB=Qk<{VoCr2

delta 331
zcmbQAxi)2j&c>2n{)r79n;8ZE^E0wcG!(ab%>V&51`zr?ly7DTVO-{g(7HzG{E3B9
zn{yPFu<-IiwQ>Vh@Nbq?{mj9~02N{f3b8S4meZ4Cl1<GkDauSOZeXr0WQY(0N+hS|
zq!v}`B_$?jr%sMExXXtjq~(C2FfS!OIVUwSue6|$IfFSlC9x#6Br`Xa3(hEHapq!w
z%+AUtZNe37H2Ia06eHv0NE2yKE{zCApsfal++f<IkOxd_74l{PVM!rhP$7S9p+J&m
jZJ}Uop-=?K?Wq+7nMJ9^g~GlERuq>MiUbvk7V7~3Ts%*q