Skip to content
Snippets Groups Projects
Commit 2eb7bbf5 authored by Satish's avatar Satish
Browse files

Merge branch 'v7' of http://code.vtiger.com/satish.dvnk/vtigercrm into v7 

Conflicts:
	layouts/v7/modules/Settings/Vtiger/OutgoingServerEdit.tpl
	modules/Emails/models/Record.php
	modules/Migration/schema/660_to_700.php
parents b2e6c20e af0ee396
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright 2023 Vtiger. All rights reserved.