Iglocska e0ef372392 Merge branch 'master' into feature/sg ... Conflicts: app/Controller/EventsController.php app/Controller/UsersController.php app/Model/Event.php		2015-04-12 10:40:31 +02:00
..
Upgrade_21_to_22	Documentation changes	2014-10-07 23:21:48 +02:00
build/technical_design	Some minor changes	2014-01-09 17:13:07 +01:00
format	Version 1.0 of MISP XML Document Type Definition.	2013-07-29 11:37:09 +02:00
logos	MISP logos added (SVG, PDF and PNG)	2015-02-16 10:12:08 +01:00
setup	Merge branch 'hotfix-2.2.40' into develop	2014-09-12 13:33:55 +02:00
INSTALL.centos6.txt	Merge branch 'cakeresque-update' into hotfix-2.3.59	2015-04-08 22:40:42 +02:00
INSTALL.centos7.txt	Merge branch 'cakeresque-update' into hotfix-2.3.59	2015-04-08 22:40:42 +02:00
INSTALL.sysop.txt	updated structure of the documentation	2013-02-15 08:20:14 +01:00
INSTALL.ubuntu1404.txt	Merge branch 'cakeresque-update' into hotfix-2.3.59	2015-04-08 22:40:42 +02:00
MYSQL.sql	Organization field in Servers too short to fit valid organisation identifiers, fixes #436	2015-03-17 00:06:59 +01:00
UPDATE.txt	Include composer.phar self-update	2015-04-08 14:27:04 +02:00
UPGRADE.txt	Use cake-resque:4.1.2	2015-04-08 13:05:05 +02:00
apache.misp	Changes to the installation	2014-10-20 14:44:03 +02:00
apache.misp.ssl	Changes to the installation	2014-10-20 14:44:03 +02:00
documentation.pdf	New documentation left off	2015-02-05 10:14:27 +01:00
get-misp-automation.py	Example file on how to get the exported IDS data from MISP	2015-03-15 02:20:50 +01:00
upgrade_2.3.sql	Typo fail fixed	2014-10-07 23:44:50 +02:00
upgrade_2.4.sql	Initial commit	2015-02-23 11:33:38 +01:00