Skip to content

Commit

Permalink
Merge branch 'master' into development
Browse files Browse the repository at this point in the history 
Conflicts:
	ossec_ruleset.py
  • Loading branch information
@jesuslinares
jesuslinares committed Feb 12, 2016
2 parents 30b12e5 + 24b06cd commit 36f3895
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 36f3895

Please sign in to comment.