Tobias Reich 88ef1e49b7 Merge branch 'master' into release/v3.0.0 ... # Conflicts: # dist/main.css # dist/main.js # dist/view.js # src/package.json # src/scripts/lychee.js		2015-04-17 22:55:46 +02:00
..
Build.md	Fixed path in build docs	2014-10-11 16:04:15 +02:00
Changelog.md	Added new version to the changelog	2015-04-13 21:18:48 +02:00
Docker.md	Removed sudo	2014-11-01 23:56:57 +01:00
FAQ.md	Added supported image file formats to FAQ	2014-11-08 11:28:33 +01:00
Installation.md	(Re)added php.ini to installation	2014-08-17 21:46:18 +02:00
Keyboard Shortcuts.md	Updated keyboard shortcut docs	2015-01-10 18:42:40 +01:00
Plugins.md	Updated copyright year	2015-03-29 18:58:15 +02:00
Settings.md	Updated login section in docs	2015-02-08 15:27:08 +01:00
Update.md	Added Changelog reference (#97)	2014-03-10 15:31:55 +01:00