aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2012-12-20 19:14:54 +0000
committerThomas Willingham <founder@kakste.com>2012-12-20 19:14:54 +0000
commite31600f24f45eca378759918f2a50d6446b05764 (patch)
tree5cd8cf31b6f9ec2e86d1caea13943ae73b71b032 /version.inc
parent6715c400be1c13dde04294e39de12667421b0382 (diff)
parente091d30ca4d057e810864b1ba2351b9c050ad548 (diff)
downloadvolse-hubzilla-e31600f24f45eca378759918f2a50d6446b05764.tar.gz
volse-hubzilla-e31600f24f45eca378759918f2a50d6446b05764.tar.bz2
volse-hubzilla-e31600f24f45eca378759918f2a50d6446b05764.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'version.inc')
-rw-r--r--version.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/version.inc b/version.inc
index bdbdd882b..94a1bafa8 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2012-12-18.173
+2012-12-19.174