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 /sql/mysql.sql | |
| 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 'sql/mysql.sql')
| -rw-r--r-- | sql/mysql.sql | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/mysql.sql b/sql/mysql.sql index c908022d5..7871d4534 100644 --- a/sql/mysql.sql +++ b/sql/mysql.sql @@ -1,5 +1,5 @@ -- --- ejabberd, Copyright (C) 2002-2013 ProcessOne +-- ejabberd, Copyright (C) 2002-2014 ProcessOne -- -- This program is free software; you can redistribute it and/or -- modify it under the terms of the GNU General Public License as @@ -11,10 +11,9 @@ -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- General Public License for more details. -- --- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA --- 02111-1307 USA +-- You should have received a copy of the GNU General Public License along +-- with this program; if not, write to the Free Software Foundation, Inc., +-- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -- CREATE TABLE users ( |