From: Felix Dörre Date: Wed, 25 Jun 2014 14:33:48 +0000 (+0200) Subject: Merge branch 'autotesting' X-Git-Url: https://code.wpia.club/?a=commitdiff_plain;h=7cf984749cf0027ccae90a53ebef07ab97ff164b;hp=4839e26459ef687d10226dd4cda6f291bfe62e1a;p=gigi.git Merge branch 'autotesting' Conflicts: tests/org/cacert/gigi/pages/main/RegisterPageTest.java Port config is in "test.properties" ---