Romain Neutron 134717343a Fix latest merge

2014-02-20 16:06:51 +01:00

..

API

Fix latest merge

2014-02-20 16:06:51 +01:00

appbox

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

Bridge

Merge branch '3.8'

2014-02-20 16:05:23 +01:00

cache

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

caption

Merge branch '3.8'

2014-02-20 16:05:23 +01:00

connection

Merge branch '3.8'

2014-02-20 16:05:23 +01:00

databox

Merge branch '3.8'

2014-02-20 16:05:23 +01:00

deprecated

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

eventsmanager

Merge branch '3.8'

2014-02-20 16:05:23 +01:00

Exception

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

http

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

media

Merge branch '3.8'

2014-02-20 16:05:23 +01:00

module

Merge branch '3.8'

2014-02-20 16:05:23 +01:00

patch

Merge branch '3.8'

2014-02-20 16:05:23 +01:00

patchthesaurus

Bump copyright year

2014-01-06 15:40:56 +01:00

record

Merge branch '3.8'

2014-02-20 16:05:23 +01:00

recordutils

Merge branch '3.8'

2014-02-20 16:05:23 +01:00

Session

Fix latest merge

2014-02-20 16:06:51 +01:00

set

Merge branch '3.8'

2014-02-20 16:05:23 +01:00

Setup

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

system

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

thesaurus

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

User

Merge branch '3.8'

2014-02-20 16:05:23 +01:00

ACL.php

Merge branch '3.8'

2014-02-20 16:05:23 +01:00

appbox.php

Merge branch '3.8'

2014-02-20 16:05:23 +01:00

base.php

Merge branch '3.8'

2014-02-20 16:05:23 +01:00

Browser.php

Use short array declaration

2013-11-18 13:57:33 +01:00

collection.php

Merge branch '3.8'

2014-02-20 16:05:23 +01:00

connection.php

Merge branch '3.8'

2014-02-20 16:05:23 +01:00

DailymotionWithoutOauth2.php

Remove license comments

2013-11-20 16:49:29 +01:00

databox.php

Merge branch '3.8'

2014-02-20 16:05:23 +01:00

format.php

Bump copyright year

2014-01-06 15:40:56 +01:00

ftpclient.php

Merge branch '3.8'

2014-02-20 16:05:23 +01:00

p4field.php

Bump copyright year

2014-01-06 15:40:56 +01:00

p4file.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

p4string.php

Bump copyright year

2014-01-06 15:40:56 +01:00

patchInterface.php

Bump copyright year

2014-01-06 15:40:56 +01:00

phrasea.php

Merge branch '3.8'

2014-02-20 16:05:23 +01:00

phraseadate.php

Bump copyright year

2014-01-06 15:40:56 +01:00

queries.php

Add a namespace to Phraseanet doctrine entities

2014-02-18 19:32:08 +01:00

random.php

Merge branch '3.8'

2014-02-20 16:05:23 +01:00

recordutils.php

Bump copyright year

2014-01-06 15:28:12 +01:00

setup.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

thesaurus.php

Bump copyright year

2014-01-06 15:40:56 +01:00

unicode.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

uuid.php

Fix CS

2014-01-14 12:04:38 +01:00

ZipArchiveImproved.php

Fix CS

2014-01-14 12:04:38 +01:00