Browse files

Merge pull request #55 from tobytteh/master

  • Loading branch information...
r04r committed May 27, 2018
2 parents 3d076eb + d016db1 commit 3972ed260c271c4dce433a825525c0b709a68754
Showing with 4 additions and 4 deletions.
  1. +4 −4
@@ -1,7 +1,7 @@
# Installation
* Install dependencies with [composer]( using `composer install`
* Install client-side dependencies with [npm]( using `npm install`
* Install webpack `npm install -g webpack`
@@ -31,7 +31,7 @@ It is also possible to use nginx, and a sample `rewrite.conf` is available, but
When deploying to production use `webpack -p`.
# Updating
Update your working tree (git pull?) and run the following commands. See the wiki for scripts used by
@@ -41,12 +41,12 @@ webpack -p
php includes/upgrade.php
# "Support"
If you have any questions you can try your luck on the issue tracker or `##minichan @`. Note that development is primarily geared towards running a functional []( so your feature requests may not be a priority. Pull requests are welcome if they are discussed on the issue tracker or IRC (with r04r) first.
And yes. The code is shit. :-)
# Branches
This repository consists of four primary branches, of which all but `master` may have their histories rewritten at any time:
* `master`: The main development branch. The code on this branch should work, but may not be fully functional or stable when development is happening. If you intend to submit pull requests base them off of this branch.

0 comments on commit 3972ed2

Please sign in to comment.