Roly Rudy Gutierrez Pinto 0cb56eec28 Merge remote-tracking branch 'upstream/master'

2015-04-17 19:33:00 -04:00

..

bin

…

classes

Merge remote-tracking branch 'upstream/master'

2015-04-17 19:33:00 -04:00

config

…

content

…

controllers

Merged in cochalo/processmaker/PM-2256 (pull request #1924)

2015-04-16 08:37:08 -04:00

data

Merged in mcuiza/processmaker/PM-2314,PM-2331 (pull request #1937)

2015-04-17 17:51:01 -04:00

includes

…

js

…

lib

…

menus

…

methods

Merged in gproly/processmaker/PM-2301 (pull request #1946)

2015-04-17 19:14:35 -04:00

plugins

…

skinEngine

update login

2015-04-15 16:11:04 -04:00

src

PM-2301-IMPROVEMENT

2015-04-17 14:08:13 -04:00

templates

Merged in mcuiza/processmaker/PM-2314,PM-2331 (pull request #1937)

2015-04-17 17:51:01 -04:00

test

…

xmlform

Merged in dheeyi/processmaker/PM-2313 (pull request #1950)

2015-04-17 18:09:15 -04:00

gulliver-win.bat

…

PmBootstrap.php

…