Merge branch 'master' of github.com:DaftMonk/generator-angular-fullstack

Author: DaftMonk

Diff for: app/templates/_package.json

@@ -7,7 +7,7 @@
     "morgan": "~1.0.0",
     "body-parser": "~1.5.0",
     "method-override": "~1.0.0",
-    "static-favicon": "~1.0.1",
+    "serve-favicon": "^2.0.1",
     "cookie-parser": "~1.0.1",
     "express-session": "~1.0.2",
     "errorhandler": "~1.0.0",

Diff for: app/templates/server/config/express.js

@@ -5,7 +5,7 @@
 'use strict';
 
 var express = require('express');
-var favicon = require('static-favicon');
+var favicon = require('serve-favicon');
 var morgan = require('morgan');
 var compression = require('compression');
 var bodyParser = require('body-parser');

Diff for: contributing.md

@@ -4,6 +4,7 @@ See the [contributing docs](https://github.com/yeoman/yeoman/blob/master/contrib
 
 Additionally for this generator:
 
+* Please submit PRs to the `canary` branch, it is the main development branch for this generator.
 * When submitting an issue, please follow the [guidelines](https://github.com/yeoman/yeoman/blob/master/contributing.md#issue-submission). Especially important is to make sure Yeoman is up-to-date, and providing the command or commands that cause the issue.
 * When submitting a PR, make sure that the commit messages match the [AngularJS conventions][commit-message-format] (see below).
 * When submitting a bugfix, write a test that exposes the bug and fails before applying your fix. Submit the test alongside the fix.

Diff for: readme.md

@@ -384,6 +384,10 @@ An example server component in `server/api`
 
 See the [contributing docs](https://github.com/DaftMonk/generator-angular-fullstack/blob/master/contributing.md)
 
+This project has 2 main branches: `master` and `canary`. The `master` branch is where the current stable code lives and should be used for production setups. The `canary` branch is the main development branch, this is where PRs should be submitted to (backport fixes may be applied to `master`).
+
+By seperating the current stable code from the cutting-edge development we hope to provide a stable and efficient workflow for users and developers alike.
+
 When submitting an issue, please follow the [guidelines](https://github.com/yeoman/yeoman/blob/master/contributing.md#issue-submission). Especially important is to make sure Yeoman is up-to-date, and providing the command or commands that cause the issue.
 
 When submitting a PR, make sure that the commit messages match the [AngularJS conventions](https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/).

Diff for: test/fixtures/.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory": "bower_components"
+}

Diff for: test/fixtures/package.json

@@ -7,7 +7,7 @@
     "morgan": "~1.0.0",
     "body-parser": "~1.5.0",
     "method-override": "~1.0.0",
-    "static-favicon": "~1.0.1",
+    "serve-favicon": "^2.0.1",
     "cookie-parser": "~1.0.1",
     "express-session": "~1.0.2",
     "errorhandler": "~1.0.0",