Commit Graph

3 Commits

Author SHA1 Message Date
Evan Prodromou
01f32e3998 Merge remote branch 'gitorious/1.0.x' into 1.0.x
Conflicts:
	actions/urlsettings.php
2010-11-14 06:49:43 -05:00
Evan Prodromou
76788d9790 note what 0 means for shorteners 2010-09-11 16:23:41 -04:00
Evan Prodromou
76c0e3169b move othersettings to urlsettings 2010-09-11 16:22:03 -04:00