Richard Yujra 582b3c2ee8 Merge branch 'master' of bitbucket.org:richardnoel/processmaker

2015-04-04 20:30:26 -04:00

..

bin

Merged in paulis/processmaker/BOM (pull request #1846)

2015-04-01 18:05:34 -04:00

classes

PM-1447

2015-04-04 18:43:24 -04:00

config

Improvement file appDelegation

2015-03-31 14:50:17 -04:00

content

Updating translation.en file for PM 3.0 RC2

2015-03-24 15:15:47 -04:00

controllers

Merged in paulis/processmaker/BOM (pull request #1846)

2015-04-01 18:05:34 -04:00

data

conflicts resolution

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

includes

…

js

Merged master into dashboards2

2015-03-31 14:29:38 -04:00

lib

…

menus

Merged master into dashboards2

2015-03-31 13:19:03 -04:00

methods

Merged in paulis/processmaker/BOM (pull request #1846)

2015-04-01 18:05:34 -04:00

plugins

…

skinEngine

PM-1959 Cambiar enlace en la pantalla de login de "Colosa,Inc." a "ProcessMaker Inc."

2015-03-27 15:54:23 -04:00

src

PM-2009

2015-04-03 14:31:32 -04:00

templates

Merge branch 'master' of bitbucket.org:richardnoel/processmaker

2015-04-04 20:30:26 -04:00

test

…

xmlform

Merged in cochalo/processmaker/CONSOLIDATED (pull request #1768)

2015-03-25 21:55:31 -04:00

gulliver-win.bat

…

PmBootstrap.php

…