Revert "bug 1123: fixed merge conflicts on testserver"
authorMichael Tänzer <neo@nhng.de>
Sat, 24 Aug 2013 22:27:52 +0000 (00:27 +0200)
committerMichael Tänzer <neo@nhng.de>
Sat, 24 Aug 2013 22:27:52 +0000 (00:27 +0200)
commitc6fd753005d2651382fc8aa21933376225035a31
tree0c930329a4d50f389e49ff97c15b5c651b7864f8
parent75693292de2d907bf2a4b0f12abd7cd68781f95a
Revert "bug 1123: fixed merge conflicts on testserver"

This reverts commit 75693292de2d907bf2a4b0f12abd7cd68781f95a.
includes/account.php
pages/gpg/0.php
www/gpg.php