Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

diaspora
- Activity
- Members
- Labels
- Releases
- Model registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

1bd54aba

Commit 1bd54aba authored 14 years ago by Raphael

Downloads
- Patches
- Plain Diff

Revert "Merge remote branch 'upstream/master'"

This reverts commit 570d0cf1, reversing
changes made to 9da53994.

parent 951c513f

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

config/app_config.yml.example 0 additions, 1 deletion

config/app_config.yml.example
pkg/fedora/README.md 5 additions, 6 deletions

pkg/fedora/README.md
pkg/fedora/diaspora-setup 0 additions, 2 deletions

pkg/fedora/diaspora-setup
pkg/fedora/diaspora-wsd 1 addition, 1 deletion

pkg/fedora/diaspora-wsd
pkg/fedora/diaspora.spec 0 additions, 6 deletions

pkg/fedora/diaspora.spec
pkg/fedora/dist/.gitkeep 0 additions, 0 deletions

pkg/fedora/dist/.gitkeep
pkg/fedora/make-dist.sh 3 additions, 1 deletion

pkg/fedora/make-dist.sh
pkg/ubuntu/README.md 11 additions, 4 deletions

pkg/ubuntu/README.md
pkg/ubuntu/diaspora-install 1 addition, 2 deletions

pkg/ubuntu/diaspora-install
pkg/ubuntu/diaspora-setup 0 additions, 2 deletions

pkg/ubuntu/diaspora-setup
pkg/ubuntu/diaspora-wsd 84 additions, 136 deletions

pkg/ubuntu/diaspora-wsd
pkg/ubuntu/dist/.gitkeep 0 additions, 0 deletions

pkg/ubuntu/dist/.gitkeep
script/websocket_server.rb 0 additions, 23 deletions

script/websocket_server.rb

with 105 additions and 184 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment