From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 8 Sep 2014 13:14:40 +0000 (-0400)
Subject: Merge branch 'develop' of cvs2:web/PetoskeyRobotics into develop
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=47c669d5330e36607f46335a276cd705cd435cfb;p=web%2FPetoskeyRobotics.git

Merge branch 'develop' of cvs2:web/PetoskeyRobotics into develop

Conflicts:
	wp-config.php
---

47c669d5330e36607f46335a276cd705cd435cfb
diff --cc wp-config.php
index e4f8dd2,76e9f41..3e3da6d
--- a/wp-config.php
+++ b/wp-config.php
@@@ -14,10 -14,10 +14,11 @@@
   * @package WordPress
   */
  define('WP_SITEURL', 'http://' . $_SERVER['SERVER_NAME'] . '/www.petoskeyrobotics.org/wordpress');
 -define('WP_HOME', 'http://' . $_SERVER['SERVER_NAME'].'/www.petoskeyrobotics.org/index.php');
 +define('WP_HOME', 'http://' . $_SERVER['SERVER_NAME'].'/www.petoskeyrobotics.org');
  define('WP_CONTENT_DIR', $_SERVER['DOCUMENT_ROOT'] . '/www.petoskeyrobotics.org/wp-content');
  define('WP_CONTENT_URL', 'http://' . $_SERVER['SERVER_NAME'] . '/www.petoskeyrobotics.org/wp-content');
 +//define('HEADWAY_ALLOW_RESET', true);
+ define('FS_METHOD', 'direct');
  // ** MySQL settings - You can get this info from your web host ** //
  /** The name of the database for WordPress */
  define('DB_NAME', 'petoskeyrobotics');