Brayan Osmar Pereyra Suxo 8800f47343 Correccion de conflictos

2014-05-29 15:38:10 -04:00

..

bin

Little fix when $output has not defined such as a normal terminal env like jenkins job execution.

2014-05-08 09:47:39 -04:00

classes

Correccion de conflictos

2014-05-29 15:38:10 -04:00

config

Merge code github > bitbucket 2014-05-23 16:35

2014-05-23 16:32:18 -04:00

content

Updating .po and .sql files (requested by Erik)

2014-05-22 15:29:49 -04:00

controllers

Merge code github > bitbucket 2014-05-23 16:35

2014-05-23 16:32:18 -04:00

data

Merge code github > bitbucket 2014-05-23 16:35

2014-05-23 16:32:18 -04:00

includes

…

js

Merge code github > bitbucket 2014-05-23 16:35

2014-05-23 16:32:18 -04:00

lib

…

menus

BUG_14693 Some functionalities inside the BPMN designer are not working.

2014-04-29 13:14:11 -04:00

methods

Merge code github > bitbucket 2014-05-23 16:35

2014-05-23 16:32:18 -04:00

plugins

…

skinEngine

Merge code github > bitbucket 2014-05-23 16:35

2014-05-23 16:32:18 -04:00

src

Correccion de label añadiendo TRANSLATIONS

2014-05-29 15:33:27 -04:00

templates

Merged in gproly/processmaker (pull request #503)

2014-05-23 17:08:03 -04:00

test

…

xmlform

Merge code github > bitbucket 2014-05-23 16:35

2014-05-23 16:32:18 -04:00

gulliver-win.bat

…

PmBootstrap.php

…