brantje b09e420862 Merge branch 'padlock_importer_2' of https://github.com/bingen/passman into bingen-padlock_importer_2		2017-07-29 11:36:46 +02:00
..
app	Merge remote-tracking branch 'origin/master' into csv_export_fix	2017-07-01 15:57:08 +02:00
exporters	Update phpunit	2017-07-01 18:09:39 +02:00
importers	Padlock importer: fix code style	2017-07-28 00:29:05 +02:00
lib	Fix some small scrutinizer issues	2016-12-31 13:58:29 +01:00
vendor	Remove sourcemap	2017-02-22 18:02:55 +01:00
settings-admin.js	Code style fixes	2017-02-22 18:02:55 +01:00
templates.js	Remove password generator from change vault key. Solves #313	2017-06-13 23:42:24 +02:00