Brayan Pereyra 9daede1a50 Conflictos arreglados

2015-02-12 16:37:06 -04:00

..

bin

PM-1468

2015-02-05 10:24:19 -04:00

classes

Conflictos arreglados

2015-02-12 16:37:06 -04:00

config

Merge branch 'master' of bitbucket.org:colosa/processmaker into LISTS

2015-02-06 15:48:38 -04:00

content

Updating .po and .sql files for PM 3.0 Beta 4

2015-02-06 17:21:59 -04:00

controllers

Merged in paulis/processmaker/PM-1464 (pull request #1408)

2015-02-10 11:03:09 -04:00

data

Merge branch 'master' of bitbucket.org:colosa/processmaker into LISTS

2015-02-11 09:02:02 -04:00

includes

…

js

…

lib

…

menus

…

methods

Conflictos arreglados

2015-02-12 16:37:06 -04:00

plugins

…

skinEngine

PM-1472 16565: Red background graphic for error messages needs to be taller to see the text clearly

2015-02-05 11:16:48 -04:00

src

Merge branch 'master' of bitbucket.org:colosa/processmaker into LISTS

2015-02-11 09:02:02 -04:00

templates

Conflictos arreglados

2015-02-12 16:37:06 -04:00

test

…

xmlform

Merged in dheeyi/processmaker/PM-1501 (pull request #1420)

2015-02-11 13:36:39 -04:00

gulliver-win.bat

…

PmBootstrap.php

…