marcelo.cuiza 0fb6241bd9 solving conflicts

2015-06-25 15:35:29 -04:00

..

bin

PM-2917 "Case Scheduler issues" SOLVED

2015-06-17 10:25:36 -04:00

classes

solving conflicts

2015-06-25 15:35:29 -04:00

config

solving conflicts

2015-06-25 15:35:29 -04:00

content

…

controllers

Merged master into dashboards2

2015-06-15 17:29:52 -04:00

data

solving conflicts

2015-06-25 15:35:29 -04:00

includes

…

js

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

2015-06-18 10:26:35 -04:00

lib

…

menus

PM-2914 La función RouteCase no puede probarse desde ADMIN/WEB SERVICES TEST SOLVED

2015-06-19 15:31:29 -04:00

methods

NND-74 Agregar un total queue

2015-06-18 10:09:38 -04:00

plugins

…

skinEngine

…

src

solving conflicts

2015-06-25 15:35:29 -04:00

templates

PM-2876 0017471 Change text from "ProcessMaker Dev Tools/User Applications" to "User Applications" SOLVED

2015-06-19 15:07:50 -04:00

test

…

xmlform

…

gulliver-win.bat

…

PmBootstrap.php

…