Rubén D ccc7ce9cfa Merge branch '3.0' into v3.0 ...

Conflicts:
	app/modules/web/Controllers/Helpers/Grid/EventlogGrid.php
	app/modules/web/Controllers/Helpers/Grid/TrackGrid.php
	public/js/app-actions.js
	public/js/app-actions.min.js

2019-01-24 11:39:28 +01:00

..

Controllers

* [FIX] Wrong behavior when upgrading custom fields, public links and API tokens from v2

2019-01-24 11:04:58 +01:00

Forms

Merge branch 'master' of /home/rdb/DEV/PhpstormProjects/sysPass with conflicts.

2019-01-15 16:21:15 +01:00

plugins

* [ADD] Work in progress

2017-10-17 02:00:53 +02:00

themes/material-blue

Merge branch 'master' into v3.0

2019-01-24 11:15:26 +01:00

Init.php

Merge branch '3.0' into v3.0

2019-01-24 11:39:28 +01:00

module.php

* [ADD] Password reset module. Work in progress

2018-02-27 00:06:59 +01:00