Tobias Reich f460569bdc Merge branch 'develop' into feature/subalbums ... # Conflicts: # src/package.json # src/scripts/lychee.js		2016-10-25 18:32:14 +02:00
..
Build.md
Changelog.md	Added v3.1.5 to changelog	2016-10-25 18:07:51 +02:00
FAQ.md	Updated outdated PHP version	2016-04-25 20:45:11 +02:00
Installation.md	Added "session" to required extensions #579	2016-07-27 20:31:33 +02:00
Keyboard Shortcuts.md	Updated keyboard shortcuts doc as we are now using the meta key to trigger selection	2016-08-28 13:06:00 +02:00
Plugins.md
Settings.md
Update.md	Fixed broken URL in Update.md #516	2016-04-18 09:58:25 +02:00