MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
MISP/app/Plugin
History
iglocska 324418dcf9 Merge branch 'master' into 2.4-beta 
Merge and upgrade of several new features

Conflicts:
	VERSION.json
	app/Controller/ShadowAttributesController.php
	app/Controller/TagsController.php
	app/Model/AppModel.php
	app/Model/Event.php
	app/Plugin/SysLogLogable/Model/Behavior/SysLogLogableBehavior.php
 		2015-11-08 23:26:19 +01:00
..
Assets/models/behaviors Integration of plugins / cake core into MISP as submodules 2014-02-07 09:03:28 +01:00
CertAuth removed session handling from plugin and moved to AppController 2015-04-28 11:25:13 -03:00
SysLog/Lib Integration of plugins / cake core into MISP as submodules 2014-02-07 09:03:28 +01:00
SysLogLogable/Model/Behavior Merge branch 'master' into 2.4-beta 2015-11-08 23:26:19 +01:00
UrlCache :q 2013-11-06 10:52:18 +01:00
magic_tools/models/behaviors Integration of plugins / cake core into MISP as submodules 2014-02-07 09:03:28 +01:00
empty Merge branch 'master' into develop 2012-11-20 11:01:18 +01:00
index.txt Integration of plugins / cake core into MISP as submodules 2014-02-07 09:03:28 +01:00