Viewing all changes in revision 1216.
- Committer: Felipe Zimmerle
- Date: 2013-12-11 14:23:38 UTC
- mfrom: (1212.1.1)
- Revision ID: git-v1:feb5772fc06c48098ceabef81478b09c907768d4
Merge branch 'buildbot_tests_iv' of https://github.com/SpiderLabs/ModSecurity into buildbot_tests_iv
Conflicts:
nginx/modsecurity/config
Conflicts:
nginx/modsecurity/config
- files modified:
- nginx/modsecurity/config
expand all
collapse all
added
removed
