Merge branch 'emq20' of https://github.com/emqtt/emqttd into emq20

This commit is contained in:
turtled 2017-01-12 10:54:02 +08:00
commit 96d053dbd1
1 changed files with 1 additions and 1 deletions

View File

@ -1,5 +1,5 @@
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% Copyright (c) 2016 Feng Lee <feng@emqtt.io>. All Rights Reserved. %% Copyright (c) 2016-2017 Feng Lee <feng@emqtt.io>. All Rights Reserved.
%% %%
%% Licensed under the Apache License, Version 2.0 (the "License"); %% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License. %% you may not use this file except in compliance with the License.