ferdium-app - Mirror of https://github.com/ferdium/ferdium-app

	Commit message (Expand)	Author	Age
*	Merge branch 'develop' into patch-1	Stefan Malzner	2017-10-27
\|\
\| *	Merge branch 'develop' into fix_tray	Stefan Malzner	2017-10-27
\| \|\
\| * \	Merge branch 'develop' into fix_tray	Stefan Malzner	2017-10-27
\| \|\ \
\| * \| \|	Removed mainWindow parameter from Tray class	Atakan Goktepe	2017-10-27
\| * \| \|	Fixed 'Show Franz' button in tray	Atakan Goktepe	2017-10-26
* \| \| \|	Merge branch 'develop' into patch-1	Stefan Malzner	2017-10-27
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Merge branch 'develop' into develop	Stefan Malzner	2017-10-27
\| \|\ \ \
\| \| * \ \	Merge branch 'develop' into pr-translate-Japanese	Stefan Malzner	2017-10-27
\| \| \|\ \ \
\| \| \| * \ \	Merge branch 'develop' into develop	Stefan Malzner	2017-10-27
\| \| \| \|\ \ \
\| \| \| \| * \ \	Merge branch 'develop' into translation/zh-Hant	Stefan Malzner	2017-10-27
\| \| \| \| \|\ \ \ \| \| \| \| \| \| \|/ \| \| \| \| \| \|/\|
\| \| \| \| \| * \|	Merge branch 'develop' into master	Stefan Malzner	2017-10-26
\| \| \| \| \| \|\ \
\| \| \| \| \| * \| \|	Changed sentence to more commonly used expression	Robin Haveneers	2017-10-25
\| \| \| \| \| * \| \|	Fixed spelling mistake and swapped word	Robin Haveneers	2017-10-25
\| \| \| \| \| \| \|/ \| \| \| \| \| \|/\|
\| \| \| \| * \| \|	Merge branch 'develop' into translation/zh-Hant	James Lin	2017-10-27
\| \| \| \| \|\ \ \ \| \| \| \| \| \| \|/ \| \| \| \| \| \|/\|
\| \| \| \| * \| \|	[add] translation (zh-Hant)	ywjameslin	2017-10-26
\| \| \| \| \| \|/ \| \| \| \| \|/\|
\| \| \| * \| \|	Merge branch 'develop' into develop	Stefan Malzner	2017-10-26
\| \| \| \|\ \ \ \| \| \| \| \| \|/ \| \| \| \| \|/\|
\| \| \| * \| \|	[translation] Spanish	Guillerman	2017-10-25
\| \| \| \| \|/ \| \| \| \|/\|
\| \| * \| \|	Merge branch 'develop' into pr-translate-Japanese	Stefan Malzner	2017-10-26
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| \| * \|	Fixes #111 on mainline	Darko Bozhinovski	2017-10-26
\| \| \| \|/
\| \| * /	Fix translation	koma	2017-10-25
\| \| \|/
\| * \|	Update TabBarSortableList.js	Peter Migotto	2017-10-26
\| * \|	Update en-US.json	Peter Migotto	2017-10-26
\| * \|	Added "sidebar.addservice"	Peter Migotto	2017-10-26
\| * \|	Fixes hover on "Add new service" not showing translation	Peter Migotto	2017-10-26
\| * \|	Added "enableSystemTray" line and minor fixes	Peter Migotto	2017-10-25
\| \|/
* \|	[translation] Update Dutch (nl-NL)	Jens	2017-10-27
* \|	Update translations	Jens	2017-10-26
\|/
*	Don't apply app.makeSingleInstance on macOS	Stefan Malzner	2017-10-24
*	Merge branch 'develop' of github.com:meetfranz/franz into develop	Stefan Malzner	2017-10-24
\|\
\| *	Merge branch 'develop' into master	Stefan Malzner	2017-10-24
\| \|\
\| * \|	updates to nl-BE locale based on Woordenlijst and Van Dale	cpeetersburg	2017-10-24
* \| \|	Merge branch 'develop' of github.com:meetfranz/franz into develop	Stefan Malzner	2017-10-24
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge branch 'develop' into feature/zoomin-alias	Stefan Malzner	2017-10-24
\| \|\ \
\| * \| \|	fix(Shortcut): Add ctrl+= alias for zoom in	Stefan	2017-10-24
* \| \| \|	add nl-BE	Stefan Malzner	2017-10-24
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Couply minor typos	Steve Guns	2017-10-22
\| * \| \|	Removed nl-NL since someone already translated that and updated languages list	Steve Guns	2017-10-22
\| * \| \|	nl-BE and nl-NL translations added	Steve Guns	2017-10-22
* \| \| \|	fix indentation	Stefan Malzner	2017-10-24
\| \|_\|/ \|/\| \|
* \| \|	fix(Windows): Fix multiple system tray icons when opening/closing Franz	Stefan	2017-10-24
\| \|/ \|/\|
* \|	Add API notice to users who run the app in dev mode	Stefan Malzner	2017-10-24
* \|	Add `warning` styles to infobox	Stefan Malzner	2017-10-24
* \|	Merge branch 'develop' into feature/recipe-manager	Stefan Malzner	2017-10-24
\|\ \
\| * \	Merge branch 'develop' into feature/payment-url	Stefan Malzner	2017-10-24
\| \|\ \
\| * \| \|	fix(Payment): Fix wrong URL encoding with umlauts in parameters	Stefan Malzner	2017-10-24
* \| \| \|	Merge branch 'develop' into feature/recipe-manager	Stefan Malzner	2017-10-24
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Fix French translation	Damien Leroy	2017-10-24
\| \|/ /
* \| \|	Fix recipe update loop	Stefan Malzner	2017-10-24
* \| \|	Improve recipe bulk download	Stefan Malzner	2017-10-24
* \| \|	replace tar.gz dependency (deprecated) with tar	Stefan	2017-10-24
\|/ /