Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/serverfireteam/panel
Browse files Browse the repository at this point in the history
Conflicts:
	README.md
	composer.json
  • Loading branch information
alenoosh committed Jun 24, 2015
2 parents 9d4d4ca + c7a1865 commit 288eb59
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Pass: 12345
##Installations
Note: if you face any problem in any of the steps you should report it at [github](https://github.com/serverfireteam/panel/issues/new)

1. First you need to create a laravel project.
1. First you need to create a laravel project.

2. Add our package to require section of composer

Expand Down

0 comments on commit 288eb59

Please sign in to comment.