Dante df39cd5ab4 confflict correction in insert part 2

2015-04-20 11:16:45 -04:00

..

bin

…

classes

Merge branch 'dashboards2' of bitbucket.org:colosa/processmaker into dashboards2

2015-04-20 10:56:37 -04:00

config

…

content

…

controllers

Merged in cochalo/processmaker/PM-2256 (pull request #1924)

2015-04-16 08:37:08 -04:00

data

confflict correction in insert part 2

2015-04-20 11:16:45 -04:00

includes

…

js

styles corrections

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

lib

…

menus

…

methods

Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2

2015-04-16 08:43:37 -04:00

plugins

…

skinEngine

…

src

Merge branch 'dashboards2' of bitbucket.org:colosa/processmaker into dashboards2

2015-04-20 10:56:37 -04:00

templates

Merge branch 'dashboards2' of bitbucket.org:colosa/processmaker into dashboards2

2015-04-20 10:56:37 -04:00

test

…

xmlform

PM-2313 0017153: Always dropping database when creating a new site from install/newSite.

2015-04-17 14:34:29 -04:00

gulliver-win.bat

…

PmBootstrap.php

…