From: Ivan Rako <ivan.rako@srce.hr>
Date: Thu, 13 Aug 2020 17:22:37 +0000 (+0200)
Subject: Merge branch 'master' of merak.carnet.hr:/srv/paketi/carnet-debian/scm/postfix-cn
X-Git-Tag: debian/3.4.10+cn10u1~2
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=postfix-cn.git;a=commitdiff_plain;h=e190e2817c53fa6b45bfbff3e579b50022196750

Merge branch 'master' of merak.carnet.hr:/srv/paketi/carnet-debian/scm/postfix-cn
---

e190e2817c53fa6b45bfbff3e579b50022196750
diff --cc debian/changelog
index 6fb05ea,7a80985..20e7866
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,12 +1,22 @@@
++<<<<<<< HEAD
 +postfix-cn (3.4.10~cn0) stable; urgency=medium
 +
 +  * Prva verzija za buster
 +
 + -- Ivan Rako <Ivan.Rako@CARNET.hr>  Thu, 13 Aug 2020 19:05:45 +0200
 +
 +postfix-cn (3.1.8~cn1) stable; urgency=medium
++=======
+ postfix-cn (3.1.8~cn2) stable; urgency=medium
+ 
+   * Non-maintainer upload. 
+   * Dodaje izlazne poslužitelje za webmail u mynetworks (193.198.233.{95,96})
+   * Popravak greške kada duplicira unos "[::1]/128"
+ 
+  -- Zeljko Boros <Zeljko.Boros@CARNet.hr>  Wed, 05 Feb 2020 15:27:43 +0100
+ 
+ ppostfix-cn (3.1.8~cn1) stable; urgency=medium
++>>>>>>> 1185b2ef230939782be3a96949ad7d7dfa738686
  
    * sdbm->btree
    * rjesava gresku "using backwards-compatible default setting chroot=y"