MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
MISP/app
History
Iglocska 328c666e3a Merge branch 'master' into feature/sg 
Merging all the new changes from master

Conflicts:
	VERSION.json
	app/Console/Command/AdminShell.php
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Model/Attribute.php
	app/Model/Event.php
	app/Model/Log.php
	app/Model/Server.php
	app/Model/User.php
	app/View/Elements/side_menu.ctp
	app/View/Pages/administration.ctp
	app/View/Users/admin_index.ctp
 		2015-10-12 09:41:20 +02:00
..
Config Several bigger changes 2015-08-17 16:10:10 +02:00
Console Merge branch 'master' into feature/sg 2015-10-12 09:41:20 +02:00
Controller Merge branch 'master' into feature/sg 2015-10-12 09:41:20 +02:00
Lib Merge branch 'master' into feature/sg 2015-10-12 09:41:20 +02:00
Locale/eng/LC_MESSAGES Merge branch 'master' into develop 2012-11-20 11:01:18 +01:00
Model Merge branch 'master' into feature/sg 2015-10-12 09:41:20 +02:00
Plugin Set of changes to the sync 2015-10-06 01:16:48 +02:00
Test replace Risk with ThreatLevel [skip ci] 2013-11-17 17:54:15 +01:00
Vendor Merge branch 'master' into develop 2012-11-20 11:01:18 +01:00
View Merge branch 'master' into feature/sg 2015-10-12 09:41:20 +02:00
files Merge branch 'master' into feature/sg 2015-09-02 10:26:56 +02:00
tmp Added the missing ways to exploit the rpz functionality 2015-05-20 16:23:42 +02:00
webroot Merge branch 'master' into feature/sg 2015-10-12 09:41:20 +02:00
.htaccess Merge branch 'master' into develop 2012-11-20 11:01:18 +01:00
Makefile Static program analysis 2012-12-19 03:08:52 +00:00
index.php Merge branch 'master' into develop 2012-11-20 11:01:18 +01:00