Merge branch 'design_team' into ldap

Browse Source

...

This commit is contained in:

Christophe Vilayphiou committed 2012-05-17 10:00:07 +08:00

2 parents bfad553cc3 4467bc5e48

commit 1e2b146c21

3 files changed

+4 -4

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/uploaders/file_asset.rb → app/uploaders/file_asset_uploader.rb

File renamed without changes.