diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2014-05-06 21:41:29 +0200 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2014-05-06 21:41:29 +0200 |
| commit | d343447cc94822a220e2ef2948eac6dcfd860cae (patch) | |
| tree | 587a8cb8903573a2253f50bb10f56685c027d858 /include/pubsub.hrl | |
| parent | XEP-0198: Use "mgmt_" prefix for all #state fields (diff) | |
| parent | Fix PEP broadcasting issue on ODBC (EJAB-1680) (diff) | |
Merge remote-tracking branch 'processone/master' into xep-0198
Conflicts:
doc/guide.tex
src/ejabberd_c2s.erl
Diffstat (limited to 'include/pubsub.hrl')
| -rw-r--r-- | include/pubsub.hrl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/pubsub.hrl b/include/pubsub.hrl index 4f2cc9f38..08f8ea0fe 100644 --- a/include/pubsub.hrl +++ b/include/pubsub.hrl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% copyright 2006-2013 ProcessOne +%%% copyright 2006-2014 ProcessOne %%% %%% This file contains pubsub types definition. %%% ==================================================================== |