diff options
| author | Michael Tänzer <neo@nhng.de> | 2014-04-29 16:13:59 +0200 |
|---|---|---|
| committer | Michael Tänzer <neo@nhng.de> | 2014-04-29 16:13:59 +0200 |
| commit | bb11f3a0645a6b96767c9c318fa239a12c3351e5 (patch) | |
| tree | 2dba41fa37855e6f1165c89d91c04c1bc18d6f3d /pages/wot/15.php | |
| parent | 4f555bd41ae6340c21f199512090e1e47d08fa3a (diff) | |
| parent | 1a119ab85f3bd5b352223ceef6ba8f29151130b2 (diff) | |
| download | cacert-devel-bb11f3a0645a6b96767c9c318fa239a12c3351e5.tar.gz cacert-devel-bb11f3a0645a6b96767c9c318fa239a12c3351e5.tar.xz cacert-devel-bb11f3a0645a6b96767c9c318fa239a12c3351e5.zip | |
Merge branch 'bug-1221' into bug-1138
Conflicts:
includes/account.php
includes/general.php
includes/loggedin.php
includes/notary.inc.php
pages/account/43.php
pages/account/55.php
pages/wot/10.php
www/index.php
www/wot.php
Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'pages/wot/15.php')
| -rw-r--r-- | pages/wot/15.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pages/wot/15.php b/pages/wot/15.php index cca2702..c1f3e0f 100644 --- a/pages/wot/15.php +++ b/pages/wot/15.php @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ +*/ require_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); |