composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	README.md
This commit is contained in:
Stephen Abello
2020-02-05 11:24:44 +01:00
parent 65b8132914 bd083d632f
commit e5c6efbe69
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -69,12 +69,12 @@ iTop also offers mass import tools and web services to integrate with your IT
- [Changes since the previous version][58] - [Changes since the previous version][58]
- [New features][59] - [New features][59]
- [Migration notes][60] - [Migration notes][60]
- [Download iTop 2.6.1][61] - [Download iTop 2.6.3][61]
[58]: https://www.itophub.io/wiki/page?id=2_6_0:release:change_log [58]: https://www.itophub.io/wiki/page?id=2_6_0:release:change_log
[59]: https://www.itophub.io/wiki/page?id=2_6_0:release:2_6_whats_new [59]: https://www.itophub.io/wiki/page?id=2_6_0:release:2_6_whats_new
[60]: https://www.itophub.io/wiki/page?id=2_6_0:install:250_to_260_migration_notes [60]: https://www.itophub.io/wiki/page?id=2_6_0:install:250_to_260_migration_notes
[61]: https://sourceforge.net/projects/itop/files/itop/2.6.1 [61]: https://sourceforge.net/projects/itop/files/itop/2.6.3
### Versions 2.5.* ### Versions 2.5.*

5
datamodels/2.x/exclude.txt Normal file
View File

@@ -0,0 +1,5 @@
#
# The following source files are not re-distributed with the "build" of the application
# since they are used solely for constructing other files during the build process
#
combodo-db-tools