index : forums	master
	The forums.mageia.org Website	Maat [maat]

aboutsummaryrefslogtreecommitdiffstats

log msg author committer range

path: root/phpBB/phpbb

diff options

context:	12345678910152025303540
space:	includeignore
mode:	unifiedssdiffstat only

author	Tristan Darricau <tristan.darricau@sensiolabs.com>	2016-03-25 11:48:29 +0100
committer	Tristan Darricau <tristan.darricau@sensiolabs.com>	2016-03-25 11:48:29 +0100
commit	2a7c514cd074352796b3087a8263dcc552a5c807 (patch)
tree	73b9ee2b956633bb77acf1f3ad23d32c8f44fcda /phpBB/phpbb
parent	3eb6f7176ac44b5786379162fc73df3abd196646 (diff)
parent	7f9ba9849b2bd3c97fd9a828ddb46c83199b9c55 (diff)
download	forums-2a7c514cd074352796b3087a8263dcc552a5c807.tar forums-2a7c514cd074352796b3087a8263dcc552a5c807.tar.gz forums-2a7c514cd074352796b3087a8263dcc552a5c807.tar.bz2 forums-2a7c514cd074352796b3087a8263dcc552a5c807.tar.xz forums-2a7c514cd074352796b3087a8263dcc552a5c807.zip

Merge branch '3.1.x' into 3.2.x

* 3.1.x: [ticket/14437] Make sure attachments array is properly ordered before processing [ticket/14437] Preserve attachment ID order by ordering by attach_id [ticket/14437] Sort attachments after assigning inline attachments [ticket/14437] Correctly assume index from attachment display order

Diffstat (limited to 'phpBB/phpbb')

0 files changed, 0 insertions, 0 deletions

generated by cgit v1.2.1 (git 2.21.0) at 2025-11-03 07:44:27 +0000

/*
 * Guillaume Cottenceau (gc@mandriva.com)
 * Olivier Blin (oblin@mandriva.com)
 *
 * Copyright 2000 Mandriva
 *
 * This software may be freely redistributed under the terms of the GNU
 * public license.
 *
 * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
 *
 */

/*
 * Portions from Erik Troan (ewt@redhat.com)
 *