Merge branch 'master' into feature/optimize-frames

transitive-bullshit · web-flow · commit eba599017635 · 2018-08-02T14:59:09.000-04:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ffmpeg-concat",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "Concats a list of videos together using ffmpeg with sexy OpenGL transitions.",
   "main": "index.js",
   "repository": "transitive-bullshit/ffmpeg-concat",
diff --git a/readme.md b/readme.md
@@ -2,7 +2,7 @@
 
 > Concats a list of videos together using ffmpeg with sexy OpenGL transitions.
 
-[![NPM](https://img.shields.io/npm/v/ffmpeg-concat.svg)](https://www.npmjs.com/package/ffmpeg-concat) [![Build Status](https://travis-ci.org/transitive-bullshit/ffmpeg-concat.svg?branch=master)](https://travis-ci.org/transitive-bullshit/ffmpeg-concat) [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
+[![NPM](https://img.shields.io/npm/v/ffmpeg-concat.svg)](https://www.npmjs.com/package/ffmpeg-concat) [![Build Status](https://travis-ci.com/transitive-bullshit/ffmpeg-concat.svg?branch=master)](https://travis-ci.com/transitive-bullshit/ffmpeg-concat) [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
 
 ![](https://raw.githubusercontent.com/transitive-bullshit/ffmpeg-concat/master/media/example.gif)
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ffmpeg-concat",`
`3`		`- "version": "1.0.10",`
	`3`	`+ "version": "1.0.11",`
`4`	`4`	`"description": "Concats a list of videos together using ffmpeg with sexy OpenGL transitions.",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"repository": "transitive-bullshit/ffmpeg-concat",`