diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-06-12 13:49:59 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2018-06-12 13:49:59 +1200 |
| commit | 69a4af1c2b419fd7cc6356bcc2bf760969a73f95 (patch) | |
| tree | 4192ef221be88b024d96422e274836f4c6b33922 /schema/changelog-master.xml | |
| parent | 1dc1e06cfd4b7b23775984a254723b2d06b4f1dd (diff) | |
| parent | 86ad45c63c9a9e9bee59a8cc621416e1396f9c89 (diff) | |
| download | trackermap-server-69a4af1c2b419fd7cc6356bcc2bf760969a73f95.tar.gz trackermap-server-69a4af1c2b419fd7cc6356bcc2bf760969a73f95.tar.bz2 trackermap-server-69a4af1c2b419fd7cc6356bcc2bf760969a73f95.zip | |
Merge branch 'master' into netty4
# Conflicts:
# src/org/traccar/protocol/AquilaProtocolDecoder.java
# src/org/traccar/protocol/L100FrameDecoder.java
Diffstat (limited to 'schema/changelog-master.xml')
| -rw-r--r-- | schema/changelog-master.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/schema/changelog-master.xml b/schema/changelog-master.xml index 3e7944238..e8fbc0c4b 100644 --- a/schema/changelog-master.xml +++ b/schema/changelog-master.xml @@ -18,4 +18,5 @@ <include file="changelog-3.15.xml" relativeToChangelogFile="true" /> <include file="changelog-3.16.xml" relativeToChangelogFile="true" /> <include file="changelog-3.17.xml" relativeToChangelogFile="true" /> + <include file="changelog-4.0.xml" relativeToChangelogFile="true" /> </databaseChangeLog> |