dheeyi e51d2ca2b1 Merge remote branch 'upstream/master' into PM-2104

2015-04-20 17:41:04 -04:00

..

bin

…

classes

Merge remote branch 'upstream/master' into PM-2104

2015-04-20 17:41:04 -04:00

config

…

content

Updating .po and .sql file for PM3-RC4

2015-04-20 14:39:01 -04:00

controllers

…

data

Updating .po and .sql file for PM3-RC4

2015-04-20 14:39:01 -04:00

includes

…

js

styles corrections

2015-04-20 10:52:16 -04:00

lib

…

menus

…

methods

Merged master into dashboards2

2015-04-20 11:17:35 -04:00

plugins

…

skinEngine

Merge remote branch 'upstream/master' into PM-2104

2015-04-20 08:47:25 -04:00

src

Merged in dashboards2 (pull request #1955)

2015-04-20 11:46:47 -04:00

templates

Merge remote branch 'upstream/master' into PM-2104

2015-04-20 17:41:04 -04:00

test

…

xmlform

Merged in jonathanquispe/processmaker/PM2074 (pull request #1944)

2015-04-18 10:25:22 -04:00

gulliver-win.bat

…

PmBootstrap.php

…