brantje 1b173e76a1 Merge remote-tracking branch 'origin/master' into csv_export_fix		2017-07-01 15:57:08 +02:00
..
views	Remove password generator from change vault key. Solves #313	2017-06-13 23:42:24 +02:00
admin.settings.php	Refactor settings, create SettingsService	2016-12-30 13:37:40 +01:00
bookmarklet.php	Fix bookmarklet	2016-12-22 18:34:44 +01:00
main.php	ADD JSON exporter	2017-06-04 20:14:30 +02:00
part.admin.php	Fix translations	2017-05-06 13:32:39 +02:00
public_share.php	Fix OTP not working	2017-01-29 15:00:39 +01:00