]> WPIA git - gigi.git/commitdiff
projects / gigi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fce6163 4839e26)
Merge branch 'autotesting'
authorFelix Dörre <felix@dogcraft.de>
Wed, 25 Jun 2014 14:33:48 +0000 (16:33 +0200)
committerFelix Dörre <felix@dogcraft.de>
Wed, 25 Jun 2014 14:33:48 +0000 (16:33 +0200)
Conflicts:
tests/org/cacert/gigi/pages/main/RegisterPageTest.java

Port config is in "test.properties"


Trivial merge
WPIA Certificate Web Issuance Platform