diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-10-14 09:31:46 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-10-14 09:31:46 +0100 |
| commit | df7f590a456d624242196413dcdfeaf197de4011 (patch) | |
| tree | 2c468df73440f5588059ebd78bd52f14feb63402 /spec/controllers/user_controller_spec.rb | |
| parent | 6f6e5bfd92792fd4b230edcb82838889344463f3 (diff) | |
| parent | 02960185f6c2a50ff14574db0bccd8b13537d125 (diff) | |
Merge branch 'feature/refactor-css-seb' of github.com:sebbacon/alaveteli into feature/refactor-css-seb
Conflicts:
public/stylesheets/main.css
public/stylesheets/theme.css
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions