gnu-social/plugins/SimpleUrl
Brion Vibber b1a68e15b7 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
	lib/default.php
	lib/util.php
	plugins/UrlShortener/UrlShortenerPlugin.php (has been removed?)
2010-06-10 15:37:06 -07:00
..
locale Remove .po source files. Using pot files. 2010-04-30 01:57:22 +02:00
SimpleUrlPlugin.php Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x 2010-06-10 15:37:06 -07:00