Merge branch 'master' into develop
						commit
						f7e88855fe
					
				|  | @ -1,3 +1,8 @@ | |||
| Changes in [1.0.1](https://github.com/vector-im/riot-web/releases/tag/v1.0.1) (2019-02-15) | ||||
| ========================================================================================== | ||||
| [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.0...v1.0.1) | ||||
| 
 | ||||
| 
 | ||||
| Changes in [1.0.0](https://github.com/vector-im/riot-web/releases/tag/v1.0.0) (2019-02-14) | ||||
| ========================================================================================== | ||||
| [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.0-rc.2...v1.0.0) | ||||
|  |  | |||
|  | @ -2,7 +2,7 @@ | |||
|   "name": "riot-web", | ||||
|   "productName": "Riot", | ||||
|   "main": "src/electron-main.js", | ||||
|   "version": "1.0.0", | ||||
|   "version": "1.0.1", | ||||
|   "description": "A feature-rich client for Matrix.org", | ||||
|   "author": "New Vector Ltd.", | ||||
|   "dependencies": { | ||||
|  |  | |||
|  | @ -1,6 +1,6 @@ | |||
| { | ||||
|   "name": "riot-web", | ||||
|   "version": "1.0.0", | ||||
|   "version": "1.0.1", | ||||
|   "lockfileVersion": 1, | ||||
|   "requires": true, | ||||
|   "dependencies": { | ||||
|  |  | |||
|  | @ -2,7 +2,7 @@ | |||
|   "name": "riot-web", | ||||
|   "productName": "Riot", | ||||
|   "main": "electron_app/src/electron-main.js", | ||||
|   "version": "1.0.0", | ||||
|   "version": "1.0.1", | ||||
|   "description": "A feature-rich client for Matrix.org", | ||||
|   "author": "New Vector Ltd.", | ||||
|   "repository": { | ||||
|  | @ -71,7 +71,7 @@ | |||
|     "gfm.css": "^1.1.2", | ||||
|     "highlight.js": "^9.13.1", | ||||
|     "matrix-js-sdk": "1.0.0", | ||||
|     "matrix-react-sdk": "1.0.0", | ||||
|     "matrix-react-sdk": "1.0.1", | ||||
|     "modernizr": "^3.6.0", | ||||
|     "prop-types": "^15.6.2", | ||||
|     "react": "^15.6.0", | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 Bruno Windels
						Bruno Windels