MrZYX 93be252b59 Merge branch 'css-rtl' ... Conflicts: public/javascripts/application.js public/javascripts/inbox.js		2011-04-11 21:52:01 +02:00
..
blueprint	After applying known rules in diaspora-bundle.spec, perm-fix patch + *.png	2010-10-07 14:59:13 +02:00
sass	Merge branch 'css-rtl'	2011-04-11 21:52:01 +02:00
vendor	bunch of small mobile ui fixes	2011-03-31 23:38:38 -07:00
.gitkeep	Activerecord this time\!	2010-06-11 10:40:49 -07:00