Mikael Nordfeldth
f79aec36fe
Merge remote-tracking branch 'statusnet/master'
...
This merges GNU Social with current development of StatusNet. The only conflicts were some documentation, where GNU Social's versions were retained.
Conflicts:
doc-src/about
doc-src/faq
plugins/OpenID/doc-src/openid
2013-08-12 12:23:17 +02:00
..
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2013-02-13 10:55:32 -05:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2013-06-15 18:31:05 +02:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2013-06-15 12:34:25 +02:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2011-04-08 01:22:02 +02:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-07-09 13:58:16 -04:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2011-05-27 16:57:29 -04:00
2010-12-30 08:02:59 -06:00
2011-02-16 08:54:22 -06:00
2011-05-27 12:22:47 -04:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2013-06-15 13:13:15 +02:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2011-04-25 22:44:21 +02:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-07-10 12:25:40 -04:00
2013-06-15 18:41:04 +02:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2011-04-27 19:31:02 +02:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2013-08-12 12:23:17 +02:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2013-08-12 12:23:17 +02:00
2012-06-30 11:10:38 +00:00
2012-11-06 10:25:39 -05:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-07-09 09:46:27 -04:00
2012-07-03 17:33:27 -04:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2011-04-01 13:34:55 -04:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2013-07-16 10:57:06 -07:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2012-06-30 11:10:38 +00:00
2013-06-15 18:59:17 +02:00
2012-06-30 11:10:38 +00:00