Travis Ralston f73d2bae1f Merge branch 'develop' into travis/sourcemaps		2020-01-13 11:22:47 -07:00
..
build	Fix tabs	2019-11-19 20:38:06 +00:00
img	Update Electron's runtime PNG icon to match others	2019-06-18 16:59:04 +01:00
riot.im	Update Electron too	2019-11-29 19:44:19 -06:00
src	[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-dev	2020-01-09 13:43:25 -07:00
package.json	v1.5.7	2020-01-13 13:12:56 +00:00
yarn.lock	Add yarn lock file for Electron app	2019-03-11 15:33:00 +00:00