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
..
2015-03-14 12:37:48 +01:00
2014-05-14 18:12:18 -07:00
2014-05-14 18:07:01 -07:00
2014-05-14 18:07:01 -07:00
2014-05-14 18:07:01 -07:00
2014-05-14 18:07:01 -07:00
2014-05-14 18:07:01 -07:00
2015-02-09 18:58:43 -08:00
2015-04-21 23:27:30 +02:00
2012-08-01 05:02:43 -07:00
2014-12-09 15:09:19 +01:00
2015-03-31 17:52:03 -07:00
2015-03-09 20:40:02 -07:00
2014-06-10 21:21:50 -07:00
2015-04-23 21:04:01 +02:00
2014-05-04 20:30:52 -07:00
2014-12-30 12:12:55 +01:00
2015-01-02 18:14:23 +01:00
2014-04-16 20:28:23 -07:00
2015-01-15 16:37:47 -08:00
2015-02-04 15:48:39 -08:00
2015-04-23 19:49:41 -07:00
2014-04-30 16:35:50 -07:00
2015-03-03 14:38:34 -08:00
2013-02-19 19:08:04 -08:00
2015-04-22 10:31:36 +02:00
2014-11-05 18:39:10 -08:00
2015-03-04 14:00:36 -08:00
2015-01-05 20:57:30 -08:00
2015-04-21 10:05:26 +02:00
2014-10-07 18:11:36 +02:00
2015-04-21 10:05:26 +02:00
2014-12-19 01:48:47 -08:00
2013-01-15 13:59:52 -08:00
2015-03-17 18:45:56 -07:00
2012-12-19 16:59:45 -08:00
2014-12-11 11:44:46 +01:00
2014-08-09 01:18:31 +00:00
2014-07-01 22:02:36 -07:00
2015-02-04 17:32:29 -08:00
2015-02-05 15:11:51 -08:00
2013-12-25 16:57:48 -08:00
2015-03-12 10:19:56 +01:00
2013-08-06 18:26:57 -07:00
2015-03-23 10:59:54 +01:00
2015-01-02 18:14:23 +01:00
2014-03-02 19:40:59 -08:00
2015-04-21 23:08:54 +02:00
2014-07-29 19:09:07 +00:00
2015-04-19 15:22:50 +02:00