Merge branch 'master' into 566_Fix_Calendar_Issues (a5ec9b33) · Commits · Daniel Lennartz / vtigercrm · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

vtigercrm
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents

Snippets Groups Projects

Admin message

Welcome to Vtiger Community. To gain access for account, please contact [ community @ vtiger.com ]

a5ec9b33

Commit a5ec9b33 authored 7 years ago by Conrado @ VGS

Downloads
- Plain Diff

Merge branch 'master' into 566_Fix_Calendar_Issues

# Conflicts:
#	modules/Users/views/Calendar.php

parents 78dda4f0 174a2782

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

modules/Migration/schema/700_to_701.php 9 additions, 0 deletions

modules/Migration/schema/700_to_701.php
modules/Users/views/Calendar.php 1 addition, 2 deletions

modules/Users/views/Calendar.php
packages/vtiger/optional/Projects.zip 0 additions, 0 deletions

packages/vtiger/optional/Projects.zip
pkg/vtiger/modules/Projects/Project/layouts/v7/modules/Project/SummaryViewWidgets.tpl 1 addition, 1 deletion

...Project/layouts/v7/modules/Project/SummaryViewWidgets.tpl
vtigerversion.php 2 additions, 2 deletions

vtigerversion.php

with 13 additions and 5 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

Copyright 2023 Vtiger. All rights reserved.