git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

  • mmn's avatar
    Merge remote-tracking branch 'statusnet/master' · f79aec36
    mmn authored
    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
    f79aec36
Name
Last commit
Last update
..
af/LC_MESSAGES Loading commit data...
ar/LC_MESSAGES Loading commit data...
arz/LC_MESSAGES Loading commit data...
be-tarask/LC_MESSAGES Loading commit data...
bg/LC_MESSAGES Loading commit data...
br/LC_MESSAGES Loading commit data...
ca/LC_MESSAGES Loading commit data...
cs/LC_MESSAGES Loading commit data...
da/LC_MESSAGES Loading commit data...
de/LC_MESSAGES Loading commit data...
el/LC_MESSAGES Loading commit data...
en/LC_MESSAGES Loading commit data...
en_GB/LC_MESSAGES Loading commit data...
eo/LC_MESSAGES Loading commit data...
es/LC_MESSAGES Loading commit data...
eu/LC_MESSAGES Loading commit data...
fa/LC_MESSAGES Loading commit data...
fi/LC_MESSAGES Loading commit data...
fr/LC_MESSAGES Loading commit data...
fur/LC_MESSAGES Loading commit data...
ga/LC_MESSAGES Loading commit data...
gl/LC_MESSAGES Loading commit data...
he/LC_MESSAGES Loading commit data...
hsb/LC_MESSAGES Loading commit data...
hu/LC_MESSAGES Loading commit data...
ia/LC_MESSAGES Loading commit data...
is/LC_MESSAGES Loading commit data...
it/LC_MESSAGES Loading commit data...
ja/LC_MESSAGES Loading commit data...
ka/LC_MESSAGES Loading commit data...
ko/LC_MESSAGES Loading commit data...
mk/LC_MESSAGES Loading commit data...
ml/LC_MESSAGES Loading commit data...
nb/LC_MESSAGES Loading commit data...
nl/LC_MESSAGES Loading commit data...
nn/LC_MESSAGES Loading commit data...
pl/LC_MESSAGES Loading commit data...
pt/LC_MESSAGES Loading commit data...
pt_BR/LC_MESSAGES Loading commit data...
ru/LC_MESSAGES Loading commit data...
sr-ec/LC_MESSAGES Loading commit data...
sv/LC_MESSAGES Loading commit data...
te/LC_MESSAGES Loading commit data...
tl/LC_MESSAGES Loading commit data...
tr/LC_MESSAGES Loading commit data...
uk/LC_MESSAGES Loading commit data...
vi/LC_MESSAGES Loading commit data...
zh_CN/LC_MESSAGES Loading commit data...
zh_TW/LC_MESSAGES Loading commit data...
Makefile Loading commit data...
README Loading commit data...
statusnet.pot Loading commit data...