ilya
|
08b9aa864a
|
Merge branch 'master' of github.com:diaspora/diaspora into fb
Conflicts:
app/views/layouts/application.html.haml
app/views/shared/_publisher.haml
app/views/shared/_sub_header.haml
app/views/users/edit.html.haml
config/deploy_config.yml
config/routes.rb
|
2010-09-27 15:39:50 -07:00 |
|
ilya
|
eaea26e58d
|
the public aspect is now set in application controller
|
2010-09-23 19:33:33 -07:00 |
|
danielvincent
|
40c96fc619
|
DG IZ; click to edit rollover text on aspect manage page
|
2010-09-20 15:53:56 -07:00 |
|
Ariel Zavala
|
51b6ce9dfb
|
Added localization to layouts and shared views
|
2010-09-16 15:11:58 -04:00 |
|
Daniel Vincent Grippi
|
da8ec589b7
|
RS, DG; display the correct tab on manage, change edit to manage
|
2010-09-14 10:05:59 -07:00 |
|