Julio Cesar Laura 47c46083a6 Merge remote branch 'upstream/master'

2014-06-02 16:20:20 -04:00

..

bin

…

classes

Merge remote branch 'upstream/master'

2014-06-02 16:20:20 -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

little tweaks to show pmui and mafe versions on system information section

2014-05-29 17:17:15 -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

…

methods

Merge remote branch 'upstream/master'

2014-06-02 16:20:20 -04:00

plugins

…

skinEngine

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

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

src

Merged in victorsl/processmaker (pull request #511)

2014-06-02 11:27:58 -04:00

templates

Merge remote branch 'upstream/master'

2014-06-02 16:20:20 -04:00

test

…

xmlform

Merge remote branch 'upstream/master'

2014-06-02 16:19:05 -04:00

gulliver-win.bat

…

PmBootstrap.php

…