forked from asbjornu/drywall
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'codersArmy/master'
* codersArmy/master: 0.16.6 Replaced all imports of 'public/less/bootstrap-vars.less' with import of '/public/vendor/bootstrap/less/variables.less' 0.16.5 Using bootstraps' variables file at public/vendor/bootstrap/less/variables.less, instead of our static copy at public/less/bootstrap-vars.less added link to email trouble wiki page version bumped 0.16.4 update deps version bumped 0.16.3 Fixed HTML5 Validator Errors version bumped 0.16.2 updated less variables file for bootstrap v3.3.5 # Conflicts: # package.json # public/less/bootstrap-vars.less # views/index.jade
- Loading branch information
Showing
11 changed files
with
22 additions
and
883 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.