Tobias Reich 1fc3ca05cc Merge branch 'develop' into feature/subalbums ... # Conflicts: # src/package.json # src/scripts/lychee.js		2016-08-28 13:01:37 +02:00
..
images	Optimized images	2016-04-10 16:43:28 +02:00
scripts	Merge branch 'develop' into feature/subalbums	2016-08-28 13:01:37 +02:00
styles	Use outline for selected items, not border.	2016-08-15 22:02:03 +02:00
gulpfile.js	Added basicContext to view scripts	2016-04-08 22:46:13 +02:00
npm-shrinkwrap.json	Updated deps	2016-08-09 09:53:24 +02:00
package.json	Updated version to 3.1.4	2016-08-27 18:12:35 +02:00