« Previous | Next » 

Revision 883839c5

ID883839c5e08963aa8a29e2d90ddcadd502964a0d
Parent 02f36ede, 64f87a36
Child 8c28d424

Added by Antony Chazapis over 12 years ago

Merge branch 'invitations'

Conflicts:
pithos/im/templates/users_info.html
pithos/im/views.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted