Ilya Zhitomirskiy 71dd8dc7f3 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: app/models/app_config.rb		2011-06-09 15:51:59 -07:00
..
controllers	Limit posts in the RSS feed, wecan come back to this and not limit it, and instead cache the static feed, when we have a little more time.	2011-06-08 12:00:08 -07:00
helpers	fix youtu.be links	2011-05-29 22:13:42 +02:00
mailers	Revert "added a podwide email preference"	2011-05-18 10:38:45 -07:00
models	Merge branch 'master' of github.com:diaspora/diaspora	2011-06-09 15:51:59 -07:00
uploaders	Make urls not change on processing	2011-03-21 18:42:36 -07:00
views	fixed the getting started step 3, ignore the CA certs in developement is now in initializer, changed the 'login' -> 'connect' [to facebook] png	2011-06-09 15:12:35 -07:00