WolFi 7deb663a11 Merge branch 'marius-wieschollek-PASSMAN-419' into feature/merges_v2.2.0		2018-12-16 13:43:18 +01:00
..
app	Merge remote-tracking branch 'origin/fix_486' into feature/merges_v2.2.0	2018-12-16 13:01:50 +01:00
exporters	Merge branch 'PASSMAN-419' of https://github.com/marius-wieschollek/passman into marius-wieschollek-PASSMAN-419	2018-12-16 12:15:20 +01:00
importers	Fix import, wrong JSON field for username	2018-12-11 11:59:34 +01:00
lib
vendor	[#264] Fix export file download in Firefox	2018-04-07 20:26:40 +02:00
settings-admin.js
templates.js	updated binaries	2018-11-21 17:34:07 +01:00