Skip to content

Commit

Permalink
Merge pull request #21 from ParvulaCMS/dev
Browse files Browse the repository at this point in the history
Merge dev to master
  • Loading branch information
BafS committed Jun 30, 2016
2 parents 9633ac1 + 71b8df4 commit 5582ad7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ There are 2 bundled themes by default: "simple" and "galaxy".
You can edit pages online at **yoursite.com/admin** (admin url can be edited in `plugins/Admin/config.php`).

Don't forget to *chmod 755* `data/pages` and *change the default password* in `plugins/Admin/config.php` !
Don't forget to *chmod 755* `data/pages` and *change the default password* in `data/users/users.php` !
8 changes: 3 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "bafs/parvula",
"description": "An extremely simple & flexible CMS generated from flat files",
"type": "project",
"keywords": ["cms", "flat files", "flat cms", "markdown"],
"keywords": ["cms", "flat files", "flat cms", "markdown", "api-first"],
"license": "MIT",
"homepage": "https://github.com/BafS/parvula",
"authors": [
Expand All @@ -26,10 +26,8 @@
"slim/slim": "^3.4",
"tuupola/slim-jwt-auth": "^2.2",
"paragonie/random_compat": "^2.0",
"php-jsonpatch/php-jsonpatch": "^1.3",
"ext-mbstring": "*",
"flow/jsonpath": "^0.3.1",
"codeception/codeception": "^2.2"
"php-jsonpatch/php-jsonpatch": "^2.1",
"ext-mbstring": "*"
},
"require-dev": {
"filp/whoops": "^2.1"
Expand Down

0 comments on commit 5582ad7

Please sign in to comment.