danteloayza d4ecc6c1a4 conflicts resolution

2015-03-30 11:00:04 -04:00

..

bin

I reviewed the XSS - MEDIUM in 7 files

2015-03-16 15:24:35 -04:00

core

…

includes

…

js

conflicts resolution

2015-03-30 11:00:04 -04:00

methods

I solved the issue PM-1885

2015-03-23 15:13:24 -04:00

system

Merged in paulis/processmaker/PM-VERACODE-10 (pull request #1721)

2015-03-23 11:24:31 -04:00

templates

…

thirdparty

I added new directory HTMLPurifier

2015-03-10 10:14:01 -04:00