Skip to content
This repository has been archived by the owner on Jul 13, 2024. It is now read-only.

Commit

Permalink
Merge develop into master
Browse files Browse the repository at this point in the history
  • Loading branch information
nicoespeon committed Jan 6, 2017
2 parents c9e3142 + 70cac8f commit e5f2521
Show file tree
Hide file tree
Showing 19 changed files with 4,093 additions and 1,545 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -143,3 +143,6 @@ Thumbs.db

# Temporary files
*~

# VSCode
.vscode/
3 changes: 2 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ module.exports = function ( grunt ) {
src: [ "src/*.js" ],
options: {
force: true,
jshintrc: ".jshintrc"
jshintrc: ".jshintrc",
reporterOutput : ""
}
},

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
![gitgraph.js](/assets/logo/gitgraph-logo.png)

[![Build Status](https://secure.travis-ci.org/nicoespeon/gitgraph.js.png)](http://travis-ci.org/nicoespeon/gitgraph.js) [![devDependency Status](https://david-dm.org/nicoespeon/gitgraph.js/dev-status.png)](https://david-dm.org/nicoespeon/gitgraph.js#info=devDependencies)
[![Build Status](https://secure.travis-ci.org/nicoespeon/gitgraph.js.png)](http://travis-ci.org/nicoespeon/gitgraph.js)
===========

A JavaScript library to draw pretty git graphs in the browser.
Expand All @@ -12,7 +12,7 @@ Project page: <http://gitgraphjs.com/>
You have different options to start with the library:

- [Download the latest release](https://github.com/nicoespeon/gitgraph.js/releases/latest).
- Clone the repo: `git clone git://github.com/nicoespeon/gitgraph.js.git`.
- Clone the repo: `git clone git@github.com:nicoespeon/gitgraph.js.git`.
- Install with [npm](https://www.npmjs.com): `npm install --save gitgraph.js`.
- Install with [Bower](http://bower.io/): `bower install gitgraph.js`.
- Use [the CDNjs hosted lib](https://cdnjs.com/libraries/gitgraph.js).
Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "gitgraph.js",
"version": "1.7.1",
"main": [ "./build/gitgraph.js", "./build/gitgraph.css" ],
"version": "1.8.0",
"main": ["./build/gitgraph.js", "./build/gitgraph.css"],
"ignore": [
"**/.*"
]
Expand Down
Loading

0 comments on commit e5f2521

Please sign in to comment.