Erik Amaru Ortiz 2398200adf Merge branch 'master' of github.com:colosa/processmaker ...

Conflicts:
	workflow/engine/classes/class.plugin.php
	workflow/engine/classes/class.pluginRegistry.php

2013-12-03 18:23:12 -04:00

..

bin

Merge pull request #2175 from Jennydmz/BUG-10181a

2013-11-29 05:49:40 -08:00

classes

Merge branch 'master' of github.com:colosa/processmaker

2013-12-03 18:23:12 -04:00

config

FIX for api.ini parsig file, alias section was updated

2013-12-02 16:53:08 -04:00

content

Updating .po and .sql files for release 2.5.2

2013-11-28 15:54:38 -04:00

controllers

Merge branch 'master' of github.com:colosa/processmaker

2013-11-21 16:38:05 -04:00

data

Merge branch 'master' of github.com:colosa/processmaker

2013-12-03 18:23:12 -04:00

includes

…

js

Codemirror IMPROVEMENT

2013-11-29 14:50:01 -04:00

lib

…

menus

…

methods

Merge branch 'master' of github.com:colosa/processmaker

2013-12-03 18:23:12 -04:00

plugins

…

skinEngine

Merge branch 'master' of github.com:colosa/processmaker

2013-11-21 16:38:05 -04:00

src

Adding Rest Api Service Support

2013-12-03 17:10:18 -04:00

templates

Merge branch 'master' of github.com:colosa/processmaker

2013-12-03 18:23:12 -04:00

test

…

xmlform

BUG 13536 "Save as option inside a Dyanform is..." SOLVED

2013-12-03 11:47:05 -04:00

gulliver-win.bat

…

PmBootstrap.php

…