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 /src/p1_fsm.erl | |
| 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 'src/p1_fsm.erl')
| -rw-r--r-- | src/p1_fsm.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/p1_fsm.erl b/src/p1_fsm.erl index 70773e9b8..80f08c609 100644 --- a/src/p1_fsm.erl +++ b/src/p1_fsm.erl @@ -14,7 +14,7 @@ %% AB. All Rights Reserved.'' %% %% The code has been modified and improved by ProcessOne. -%% Copyright 2007-2013, ProcessOne +%% Copyright 2007-2014, ProcessOne %% %% The change adds the following features: %% - You can send exit(priority_shutdown) to the p1_fsm process to |