5 Commits (be19976da4f91212a939fd87ed5b7bfff9490bfb)

Author	SHA1	Message	Date
iglocska	8bb47c863d	Incorrect default timeout value fixed in core.php	2014-04-28 14:50:47 +02:00
Christophe Vandeplas	ac5c59e9af	minor changes	2013-06-24 15:12:30 +02:00
Christophe Vandeplas	69251490ef	Merge branch 'feature/gui' of https://github.com/MISP/MISP into ... feature/gui Conflicts: app/View/Logs/admin_index.ctp app/View/Logs/admin_search.ctp app/View/Users/memberslist.ctp	2013-05-31 17:50:00 +02:00
iglocska	54c02dc218	Update to the default config files ... - Some minor changes to the default config files	2013-03-18 13:38:52 +01:00
Andrzej Dereszowski	c90ec416f0	Configuration files renamed to better handle git merges on production systems. ... Please add new features with their default values. Their should contain only example values. renamed: app/Config/bootstrap.php -> app/Config/bootstrap.default.php renamed: app/Config/core.php -> app/Config/core.default.php renamed: app/Config/database.php -> app/Config/database.default.php	2012-10-09 14:44:25 +02:00