Ignore:
Timestamp:
03/04/2012 12:39:31 (2 years ago)
Author:
yomguy <yomguy@…>
Branches:
security
Children:
355a16a
Parents:
f0e208a (diff), 2592b8e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
yomguy <yomguy@…> (03/04/2012 12:39:31)
git-committer:
yomguy <yomguy@…> (03/04/2012 12:39:31)
Message:

Merge branch 'master' into security

Conflicts:

telemeta/models/system.py

File:
1 edited

Legend:

Unmodified
Added
Removed
  • telemeta/models/system.py

    rf83d820 r3b50bb3  
    9090    expiration_date = DateField(_('Expiration_date')) 
    9191    last_session_key = CharField(blank=True, null=True, max_length=40) 
    92     init_password   = BooleanField(_('Password initialization')) 
    9392 
    9493    class Meta(MetaCore): 
Note: See TracChangeset for help on using the changeset viewer.