diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-12-29 20:45:58 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-12-29 20:45:58 -0200 |
| commit | 97e689213ff4e829f251af526ed4e796a3cc2b71 (patch) | |
| tree | b04d03ec56305041216b72328fc9b5afde27bc76 /mod/file/manifest.xml | |
| parent | 0ab6351abb7a602d96c62b0ad35413c88113a6cf (diff) | |
| parent | 69e2d8c5d8732042c9319aef1fdea45a82b63e42 (diff) | |
| download | elgg-97e689213ff4e829f251af526ed4e796a3cc2b71.tar.gz elgg-97e689213ff4e829f251af526ed4e796a3cc2b71.tar.bz2 | |
Merge branch 'master' into saravea
Conflicts:
.gitmodules
mod/admins
mod/assemblies
mod/audio_html5
mod/beechat
mod/crud
mod/elgg-activitystreams
mod/elggman
mod/elggpg
mod/favorites
mod/federated-objects
mod/friendly_time
mod/group_alias
mod/group_operators
mod/languages
mod/lightpics
mod/openid_client
mod/spotlight
mod/suicide
mod/tasks
mod/videolist
Diffstat (limited to 'mod/file/manifest.xml')
0 files changed, 0 insertions, 0 deletions