tree f69e44cdca36b3811625992ff0f649dc736519ac
parent f7eaaca88cbcebd1e7db9e308b5ea134e1ee8695
parent a963bb123df4591e12bfc0511791d9c79a71c0f7
author snoopdave@gmail.com <snoopdave@gmail.com> 1560109761 -0400
committer snoopdave@gmail.com <snoopdave@gmail.com> 1560109761 -0400

Merge branch 'master' into bootstrap-ui

# Conflicts:
#	app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java
#	app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java