Permalink
Browse files

Merge branch 'master' of https://github.com/ffrohn/piraten_map_server

Conflicts:
	index-desktop.php
	index.php
	login.php
  • Loading branch information...
2 parents aa1f280 + 3239b71 commit e33bdf719e43aec060dd7a6a61e0bf7b7685cb35 @mohs8421 mohs8421 committed May 26, 2012
Showing with 3 additions and 4 deletions.
  1. +0 −1 index-desktop.php
  2. +3 −3 settings.php
View
@@ -334,7 +334,6 @@ function closeMsg() {
<input type="text" size="30" class="xlarge" name="username" id="username" />
</div>
</div>
-
<div class="clearfix">
<label for="password">Passwort</label>
<div class="input">
View
@@ -24,11 +24,11 @@
// SSL Wiki Verbindung benutzen?
$use_ssl = true;
$curl_path="/usr/bin/curl";
-$allow_view_public = true;
+$allow_view_public = false;
// Die letzten Änderungen anzeigen
-$show_last_x_changes = 10;
+$show_last_x_changes = 0;
-$debug = true;
+$debug = false;
// MySQL Verbindung:
// =================

0 comments on commit e33bdf7

Please sign in to comment.