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
..
Album.php	Fixed incorrect var type from server	2015-04-17 22:50:56 +02:00
Database.php	Updated copyright year	2015-03-29 18:58:15 +02:00
Import.php	Merge branch 'master' into release/v3.0.0	2015-04-17 22:55:46 +02:00
Log.php	Updated copyright	2015-02-01 22:08:37 +01:00
misc.php	Merge branch 'master' into release/v3.0.0	2015-04-17 22:55:46 +02:00
Module.php	Updated copyright	2015-02-01 22:08:37 +01:00
Photo.php	Merge branch 'master' into release/v3.0.0	2015-04-17 22:55:46 +02:00
Plugins.php	Updated copyright	2015-02-01 22:08:37 +01:00
Session.php	Stop init from returning username	2015-04-17 22:50:35 +02:00
Settings.php	Removed useless md5 hashing in front-end and added username hashing in back-end	2015-02-08 15:36:13 +01:00