diff options
| author | drecchia <danilo@deltatecnologia.com> | 2016-06-01 21:08:05 -0300 |
|---|---|---|
| committer | drecchia <danilo@deltatecnologia.com> | 2016-06-01 21:08:05 -0300 |
| commit | e4ba1ebf54838041fae352d95e399b1fb3483458 (patch) | |
| tree | 334626820ff4efa4583bb5257d19a18cd0ebf631 /database/changelog-master.xml | |
| parent | 5df7c128af15e9d1021b7570f081185f14467f09 (diff) | |
| parent | d2c85b59bde4729d027ef1bb6e874d1fd1a02c68 (diff) | |
| download | trackermap-server-e4ba1ebf54838041fae352d95e399b1fb3483458.tar.gz trackermap-server-e4ba1ebf54838041fae352d95e399b1fb3483458.tar.bz2 trackermap-server-e4ba1ebf54838041fae352d95e399b1fb3483458.zip | |
Merge branch 'master' of https://github.com/tananaev/traccar
Conflicts:
src/org/traccar/database/DataManager.java
Diffstat (limited to 'database/changelog-master.xml')
| -rw-r--r-- | database/changelog-master.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/database/changelog-master.xml b/database/changelog-master.xml index 269a0da1a..399cd3c8d 100644 --- a/database/changelog-master.xml +++ b/database/changelog-master.xml @@ -7,4 +7,5 @@ <include file="changelog-3.3.xml" relativeToChangelogFile="true" /> <include file="changelog-3.5.xml" relativeToChangelogFile="true" /> + <include file="changelog-3.6.xml" relativeToChangelogFile="true" /> </databaseChangeLog> |