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

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

..

bin

PMC-1417

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

classes

Solving conflicts merging with develop branch

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

config

PMC-1308 New attributes in the PMTables editions

2019-10-30 16:28:21 -04:00

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

PMC-1107

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

lib

…

menus

PMC-995

2019-07-25 09:53:17 -04:00

methods

PMC-1459 It is not possible to export processes

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

plugins

PMC-1445 Update gitignore file

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

skinEngine

PMC-974: Back Button: Use the filters saved and add the button return

2019-07-23 14:11:43 -04:00

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

Conflicts

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

gulliver-win.bat

…

PmBootstrap.php

…