Julio Cesar Laura Avendaño cd91821310 Solving conflicts merging with develop branch

2020-01-06 09:03:37 -04:00

..

bin

…

classes

Solving conflicts merging with develop branch

2020-01-06 09:03:37 -04:00

config

…

content

Merged in feature/PMC-1518 (pull request #7195)

2019-12-20 14:03:12 +00:00

controllers

Merged in feature/PMC-1241 (pull request #7171)

2020-01-03 13:06:05 +00:00

data

Merged in feature/PMC-1241 (pull request #7171)

2020-01-03 13:06:05 +00:00

includes

…

js

…

lib

…

menus

…

methods

PMC-1459 It is not possible to export processes

2019-12-23 12:36:40 -04:00

plugins

…

skinEngine

…

src

Merged in feature/PMC-1241 (pull request #7171)

2020-01-03 13:06:05 +00:00

templates

PMC-1518 Restructure the offline definition over the PM Tables

2019-12-20 09:10:10 -04:00

xmlform

…

gulliver-win.bat

…

PmBootstrap.php

…