Paula Quispe 76f2eaf619 Merged in feature/PMC-1332 (pull request #7136) ...

PMC-1332 PMCORE-1018

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>

2020-02-03 13:58:16 +00:00

..

bin

PMC-1417

2019-11-27 11:09:38 -04:00

classes

Merged in feature/PMC-1332 (pull request #7136)

2020-02-03 13:58:16 +00:00

config

Merged in feature/PMC-1332 (pull request #7136)

2020-02-03 13:58:16 +00:00

content

Fix conflicts with develop branch

2020-01-17 11:27:11 -04:00

controllers

PMCORE-490

2020-01-13 10:40:31 -04:00

data

Merged in feature/PMC-1332 (pull request #7136)

2020-02-03 13:58:16 +00:00

includes

…

js

PMC-1107

2019-08-26 15:15:40 -04:00

lib

…

menus

PMCORE-542

2020-01-29 15:21:27 -04:00

methods

Merged in feature/PMC-1332 (pull request #7136)

2020-02-03 13:58:16 +00:00

plugins

PMC-1445 Update gitignore file

2019-11-28 16:32:15 -04:00

skinEngine

…

src

Merged in feature/PMC-1332 (pull request #7136)

2020-02-03 13:58:16 +00:00

templates

Merged in feature/PMC-1332 (pull request #7136)

2020-02-03 13:58:16 +00:00

xmlform

Conflicts

2019-09-12 15:10:46 -04:00

gulliver-win.bat

…

PmBootstrap.php

…