Merge remote-tracking branch 'upstream/master' into sort-raisehand-better

This commit is contained in:
Chad Pilkey 2014-09-03 14:34:13 -07:00
commit 59dbdc55aa

View File

@ -280,7 +280,7 @@ public class Meeting {
}
public boolean hasExpired(int expiry) {
return (hasStarted() && userHasJoined && isEmpty() && hasBeenEmptyFor(expiry) && !meetingInfinite());
return (hasStarted() && userHasJoined && isEmpty() && hasBeenEmptyFor(expiry));
}
public boolean hasExceededDuration() {