diff options
| author | Peter Lejeck <peter.lejeck@gmail.com> | 2013-11-01 01:49:53 +0100 |
|---|---|---|
| committer | Peter Lejeck <peter.lejeck@gmail.com> | 2013-11-01 01:49:53 +0100 |
| commit | 72c861f45ff7458698c2016af5982970d7258a05 (patch) | |
| tree | d13e726c051be66cd310eda777f818f63914b5e2 | |
| parent | cfb6ce0d349280c260299c3dee6771a5228f4de5 (diff) | |
| parent | 751162f3073a37457aac548fba905ef61424eaa0 (diff) | |
Merge branch 'nuck-dev' of github.com:nokonoko/Pomf into nuck-dev
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | static/includes/settings.inc.php | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -12,7 +12,7 @@ The assets are minified and combined using [Grunt](http://gruntjs.com/). Assuming you already have Node and NPM working, compilation is easy: ``` $ npm install -g grunt-cli -$ git clone https://github.com/nokonoko/Pomf.git +$ git clone -b nuck-dev https://github.com/nokonoko/Pomf.git $ cd Pomf $ npm install $ grunt diff --git a/static/includes/settings.inc.php b/static/includes/settings.inc.php index 8a7fc7b..73c2ae7 100644 --- a/static/includes/settings.inc.php +++ b/static/includes/settings.inc.php @@ -3,7 +3,7 @@ * PDO Connection data */ // PDO socket -define('POMF_DB_CONN', 'mysql:host=localhost;dbname=pomf'); +define('POMF_DB_CONN', 'mysql:host=127.0.0.1;dbname=pomf'); // PDO user define('POMF_DB_USER', 'pomf'); // PDO password |