This repository has been archived on 2024-08-19. You can view files and clone it. You cannot open issues or pull requests or push a commit.
friendica
6679734135
Merge branch 'master' into tres
Conflicts:
include/Contact.php
include/ItemObject.php
include/api.php
include/attach.php
include/diaspora.php
include/dir_fns.php
include/enotify.php
include/event.php
include/expire.php
include/items.php
include/notifier.php
include/notify.php
include/photos.php
include/taxonomy.php
include/text.php
include/widgets.php
include/zot.php
mod/admin.php
mod/channel.php
mod/dirsearch.php
mod/display.php
mod/editwebpage.php
mod/events.php
mod/home.php
mod/item.php
mod/manage.php
mod/mood.php
mod/network.php
mod/page.php
mod/photos.php
mod/ping.php
mod/post.php
mod/thing.php
mod/viewsrc.php
view/css/mod_events.css
2015-04-23 19:49:41 -07:00
..
2014-10-10 11:42:46 +02:00
2015-03-01 19:14:59 -08:00
2015-04-23 19:49:41 -07:00
2015-02-27 11:02:07 +01:00
2015-03-02 18:02:06 -08:00
2014-10-10 11:42:46 +02:00
2014-10-10 11:42:46 +02:00
2015-03-01 19:14:59 -08:00
2015-03-01 19:14:59 -08:00
2015-03-01 19:14:59 -08:00
2013-01-06 15:11:31 -08:00
2015-04-15 12:59:22 +02:00
2015-04-21 22:45:54 +02:00
2015-03-26 20:36:28 +01:00
2015-04-02 02:23:26 +02:00
2015-04-13 23:38:36 +02:00
2015-03-27 11:52:59 +01:00
2015-03-01 19:14:59 -08:00
2015-03-01 19:14:59 -08:00
2015-03-01 19:14:59 -08:00
2015-04-23 21:04:01 +02:00
2015-04-23 21:04:01 +02:00