Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into working-1.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
mastacontrola committed Jan 15, 2017
2 parents 2daea3e + 24f33de commit 7b6e1ef
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,5 @@ There are many resources for assistance.

- A new issue on https:/FOGProject/fogproject/issues
- https://forums.fogproject.org/category/17/bug-reports

If you would like to create a pull request, please make the pull request into the dev-branch branch.
2 changes: 2 additions & 0 deletions packages/web/fogdoc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,5 @@ There are many resources for assistance.

- A new issue on https:/FOGProject/fogproject/issues
- https://forums.fogproject.org/category/17/bug-reports

If you would like to create a pull request, please make the pull request into the dev-branch branch.

0 comments on commit 7b6e1ef

Please sign in to comment.