Merge branch 'master' into develop
						commit
						223caae842
					
				| 
						 | 
				
			
			@ -1,3 +1,10 @@
 | 
			
		|||
Changes in [0.8.3-electron](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.8.3-electron) (2016-12-24)
 | 
			
		||||
=====================================================================================================================
 | 
			
		||||
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.8.3...v0.8.3-electron)
 | 
			
		||||
 | 
			
		||||
 * Fix signup by working around the fact that reCapture doesn't work on electron
 | 
			
		||||
 * Fix windows shortcut link
 | 
			
		||||
 | 
			
		||||
Changes in [0.8.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.8.3) (2016-12-22)
 | 
			
		||||
===================================================================================================
 | 
			
		||||
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.8.2...v0.8.3)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,6 +1,6 @@
 | 
			
		|||
{
 | 
			
		||||
  "name": "matrix-react-sdk",
 | 
			
		||||
  "version": "0.8.3",
 | 
			
		||||
  "version": "0.8.3-electron",
 | 
			
		||||
  "description": "SDK for matrix.org using React",
 | 
			
		||||
  "author": "matrix.org",
 | 
			
		||||
  "repository": {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue