Merge branch 'develop' of github.com:diaspora/diaspora into develop

Browse source

...

This commit is contained in:

Jonne Haß 2013-12-02 00:01:02 +01:00

parent 8baa06e477 d3f41a97c5

commit b39b0f05d0

1 changed files with 1057 additions and 1057 deletions

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

Show stats Download patch file Download diff file Expand all files Collapse all files

2114

config/initializers/rails_admin.rb

View file

File diff suppressed because it is too large Load diff