Merge branch '2.4' of github.com:MISP/MISP into 2.4

pull/1198/head
Raphaël Vinot 2016-06-02 16:09:20 +02:00
commit ea20a1fd86
1 changed files with 3 additions and 1 deletions

View File

@ -1,4 +1,6 @@
*This template aims to ease the triage of the issues you encour when using MISP*
*This template aims to ease the triage of the issues you encounter when using MISP*
*This template is meant for bug reports, if you have a feature request, please be as descriptive as possible*
### Work environment