projects / mediagoblin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c7701f bb025eb)
Merge remote branch 'remotes/macno/pushatom'
authorElrond <elrond+mediagoblin.org@samba-tng.org>
Tue, 17 Jan 2012 17:30:15 +0000 (18:30 +0100)
committerElrond <elrond+mediagoblin.org@samba-tng.org>
Tue, 17 Jan 2012 17:30:15 +0000 (18:30 +0100)
* remotes/macno/pushatom:
  As per spec, we permit to have more then 1 hub
  As suggested by Elrond, we use only one setting
  Default is now PuSH disabled
  Added PuSH capability


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.