]> saetta.ns0.it Git - zakauthe/plugins/db/commitdiff
Merge conflict.
authorAndrea Zagli <azagli@libero.it>
Mon, 25 Apr 2016 08:27:47 +0000 (10:27 +0200)
committerAndrea Zagli <azagli@libero.it>
Mon, 25 Apr 2016 08:27:47 +0000 (10:27 +0200)
1  2 
src/aute_db.c

diff --cc src/aute_db.c
Simple merge